Merge origin/main into issue-232

Author: skulidropek

docker-compose.api.yml

@@ -10,6 +10,12 @@ services:
       DOCKER_GIT_PROJECTS_ROOT_VOLUME: ${DOCKER_GIT_PROJECTS_ROOT_VOLUME:-docker-git-projects}
       DOCKER_GIT_FEDERATION_PUBLIC_ORIGIN: ${DOCKER_GIT_FEDERATION_PUBLIC_ORIGIN:-}
       DOCKER_GIT_FEDERATION_ACTOR: ${DOCKER_GIT_FEDERATION_ACTOR:-docker-git}
+      DOCKER_GIT_EXCHANGE_TARGETS: ${DOCKER_GIT_EXCHANGE_TARGETS:-}
+      DOCKER_GIT_EXCHANGE_PROJECT_REPO_URL: ${DOCKER_GIT_EXCHANGE_PROJECT_REPO_URL:-}
+      DOCKER_GIT_EXCHANGE_AGENT_PROVIDER: ${DOCKER_GIT_EXCHANGE_AGENT_PROVIDER:-codex}
+      DOCKER_GIT_EXCHANGE_AGENT_COMMAND: ${DOCKER_GIT_EXCHANGE_AGENT_COMMAND:-}
+      DOCKER_GIT_EXCHANGE_AGENT_TIMEOUT_MS: ${DOCKER_GIT_EXCHANGE_AGENT_TIMEOUT_MS:-3600000}
+      DOCKER_GIT_OUTBOX_POLLING_INTERVAL_MS: ${DOCKER_GIT_OUTBOX_POLLING_INTERVAL_MS:-5000}
     ports:
       - "${DOCKER_GIT_API_BIND_HOST:-127.0.0.1}:${DOCKER_GIT_API_PORT:-3334}:${DOCKER_GIT_API_PORT:-3334}"
     dns:

docker-compose.yml

@@ -13,6 +13,12 @@ services:
       DOCKER_GIT_PROJECTS_ROOT_VOLUME: ${DOCKER_GIT_PROJECTS_ROOT_VOLUME:-docker-git-projects}
       DOCKER_GIT_FEDERATION_PUBLIC_ORIGIN: ${DOCKER_GIT_FEDERATION_PUBLIC_ORIGIN:-}
       DOCKER_GIT_FEDERATION_ACTOR: ${DOCKER_GIT_FEDERATION_ACTOR:-docker-git}
+      DOCKER_GIT_EXCHANGE_TARGETS: ${DOCKER_GIT_EXCHANGE_TARGETS:-}
+      DOCKER_GIT_EXCHANGE_PROJECT_REPO_URL: ${DOCKER_GIT_EXCHANGE_PROJECT_REPO_URL:-}
+      DOCKER_GIT_EXCHANGE_AGENT_PROVIDER: ${DOCKER_GIT_EXCHANGE_AGENT_PROVIDER:-codex}
+      DOCKER_GIT_EXCHANGE_AGENT_COMMAND: ${DOCKER_GIT_EXCHANGE_AGENT_COMMAND:-}
+      DOCKER_GIT_EXCHANGE_AGENT_TIMEOUT_MS: ${DOCKER_GIT_EXCHANGE_AGENT_TIMEOUT_MS:-3600000}
+      DOCKER_GIT_OUTBOX_POLLING_INTERVAL_MS: ${DOCKER_GIT_OUTBOX_POLLING_INTERVAL_MS:-5000}
     ports:
       - "${DOCKER_GIT_API_BIND_HOST:-127.0.0.1}:${DOCKER_GIT_API_PORT:-3334}:${DOCKER_GIT_API_PORT:-3334}"
     dns:

packages/api/README.md

@@ -45,6 +45,12 @@ Optional env:
 - `DOCKER_GIT_PROJECTS_ROOT_VOLUME` (Docker volume name for controller state, default: `docker-git-projects`)
 - `DOCKER_GIT_FEDERATION_PUBLIC_ORIGIN` (optional public ActivityPub origin)
 - `DOCKER_GIT_FEDERATION_ACTOR` (default: `docker-git`)
+- `DOCKER_GIT_EXCHANGE_TARGETS` (optional comma-separated exchange targets, e.g. `https://exchange.lefine.pro` or `code@exchange.lefine.pro`)
+- `DOCKER_GIT_EXCHANGE_PROJECT_REPO_URL` (fallback repo for exchange Tickets without a GitHub URL)
+- `DOCKER_GIT_EXCHANGE_AGENT_PROVIDER` (default: `codex`; also supports `claude`, `opencode`, `custom`)
+- `DOCKER_GIT_EXCHANGE_AGENT_COMMAND` (optional command template; `{{prompt}}` is replaced with the task prompt)
+- `DOCKER_GIT_EXCHANGE_AGENT_TIMEOUT_MS` (default: `3600000`)
+- `DOCKER_GIT_OUTBOX_POLLING_INTERVAL_MS` (default: `5000`)
 
 ## Endpoints
 
@@ -56,6 +62,9 @@ Optional env:
 - `GET /federation/followers`
 - `GET /federation/following`
 - `GET /federation/liked`
+- `POST /federation/exchange/subscriptions` (discover remote actor, persist metadata, send signed `Follow`)
+- `GET /federation/exchange/subscriptions`
+- `POST /federation/exchange/poll` (manual remote outbox poll)
 - `POST /federation/follows` (create ActivityPub `Follow` subscription)
 - `GET /federation/follows`
 - `GET /projects`
@@ -77,6 +86,23 @@ Optional env:
 
 ## Subscription workflow (ActivityPub Follow + ForgeFed issues)
 
+Exchange targets must be explicit. Use `https://exchange.lefine.pro`, an actor URL, or a handle like `code@exchange.lefine.pro`; the API resolves the code actor document, stores its `inbox/outbox/followers/publicKey`, sends `Follow`, and polls the stored `outbox`.
+
+```bash
+./ctl request POST /federation/exchange/subscriptions '{
+  "domain":"https://social.provercoder.ai",
+  "target":"https://exchange.lefine.pro",
+  "projectRepoUrl":"https://github.com/ProverCoderAI/docker-git",
+  "agentProvider":"codex"
+}'
+
+./ctl request POST /federation/exchange/poll '{}'
+./ctl request GET /federation/exchange/subscriptions
+./ctl request GET /federation/issues
+```
+
+When a polled `Create(Ticket)` has no GitHub URL in the Ticket payload, `projectRepoUrl` or `DOCKER_GIT_EXCHANGE_PROJECT_REPO_URL` is required for the automatic docker-git project/agent run.
+
 1. Read actor profile (contains `inbox/outbox/followers/following/liked`):
 
 ```bash

packages/api/src/api/contracts.ts

@@ -362,6 +362,7 @@ export type TerminalSession = {
   readonly sshCommand: string
   readonly status: TerminalSessionStatus
   readonly createdAt: string
+  readonly attachedClients?: number | undefined
   readonly startedAt?: string | undefined
   readonly closedAt?: string | undefined
   readonly exitCode?: number | undefined
@@ -399,21 +400,46 @@ export type ForgeFedTicket = {
   readonly summary: string
   readonly content: string
   readonly mediaType?: string | undefined
-  readonly source?: string | undefined
+  readonly source?: string | ForgeFedTicketSource | undefined
   readonly published?: string | undefined
   readonly updated?: string | undefined
   readonly url?: string | undefined
+  readonly context?: string | undefined
+  readonly workType?: string | undefined
+  readonly attachment?: ReadonlyArray<unknown> | undefined
+  readonly raw?: unknown | undefined
 }
 
-export type FederationIssueStatus = "offered" | "accepted" | "rejected"
+export type ForgeFedTicketSource = {
+  readonly content?: string | undefined
+  readonly mediaType?: string | undefined
+}
+
+export type FederationIssueStatus =
+  | "offered"
+  | "accepted"
+  | "rejected"
+  | "queued"
+  | "running"
+  | "completed"
+  | "failed"
 
 export type FederationIssueRecord = {
   readonly issueId: string
   readonly offerId?: string | undefined
+  readonly activityId?: string | undefined
+  readonly actor?: string | undefined
   readonly tracker?: string | undefined
   readonly status: FederationIssueStatus
   readonly receivedAt: string
+  readonly updatedAt?: string | undefined
   readonly ticket: ForgeFedTicket
+  readonly projectId?: string | undefined
+  readonly agentId?: string | undefined
+  readonly remoteInbox?: string | undefined
+  readonly remoteOutbox?: string | undefined
+  readonly result?: string | undefined
+  readonly error?: string | undefined
 }
 
 export type CreateFollowRequest = {
@@ -437,6 +463,12 @@ export type ActivityPubFollowActivity = {
   readonly capability?: string | undefined
 }
 
+export type ActivityPubPublicKey = {
+  readonly id: string
+  readonly owner: string
+  readonly publicKeyPem: string
+}
+
 export type ActivityPubPerson = {
   readonly "@context": "https://www.w3.org/ns/activitystreams"
   readonly type: "Person"
@@ -449,10 +481,14 @@ export type ActivityPubPerson = {
   readonly followers: string
   readonly following: string
   readonly liked: string
+  readonly publicKey?: ActivityPubPublicKey | undefined
+  readonly endpoints?: {
+    readonly sharedInbox?: string | undefined
+  } | undefined
 }
 
 export type ActivityPubOrderedCollection = {
-  readonly "@context": "https://www.w3.org/ns/activitystreams"
+  readonly "@context": "https://www.w3.org/ns/activitystreams" | ReadonlyArray<string>
   readonly type: "OrderedCollection"
   readonly id: string
   readonly totalItems: number
@@ -465,6 +501,18 @@ export type FollowSubscription = {
   readonly actor: string
   readonly object: string
   readonly inbox?: string | undefined
+  readonly remoteActor?: string | undefined
+  readonly remoteInbox?: string | undefined
+  readonly remoteOutbox?: string | undefined
+  readonly remoteFollowers?: string | undefined
+  readonly remoteSharedInbox?: string | undefined
+  readonly remotePublicKeyId?: string | undefined
+  readonly remotePublicKeyPem?: string | undefined
+  readonly subscriptionName?: string | undefined
+  readonly queue?: string | undefined
+  readonly projectRepoUrl?: string | undefined
+  readonly agentProvider?: AgentProvider | undefined
+  readonly agentCommand?: string | undefined
   readonly to: ReadonlyArray<string>
   readonly capability?: string | undefined
   status: FollowStatus
@@ -487,6 +535,10 @@ export type FederationInboxResult =
     readonly kind: "issue.ticket"
     readonly issue: FederationIssueRecord
   }
+  | {
+    readonly kind: "issue.create"
+    readonly issue: FederationIssueRecord
+  }
   | {
     readonly kind: "follow.accept"
     readonly subscription: FollowSubscription
@@ -496,6 +548,30 @@ export type FederationInboxResult =
     readonly subscription: FollowSubscription
   }
 
+export type ExchangeSubscribeRequest = {
+  readonly target: string
+  readonly domain?: string | undefined
+  readonly actor?: string | undefined
+  readonly inbox?: string | undefined
+  readonly projectRepoUrl?: string | undefined
+  readonly agentProvider?: AgentProvider | undefined
+  readonly agentCommand?: string | undefined
+}
+
+export type ExchangePollRequest = {
+  readonly target?: string | undefined
+  readonly runTasks?: boolean | undefined
+}
+
+export type ExchangePollResult = {
+  readonly polledAt: string
+  readonly subscriptions: number
+  readonly totalItems: number
+  readonly newItems: number
+  readonly processedItems: number
+  readonly failedItems: number
+}
+
 export type ApiEventType =
   | "snapshot"
   | "project.created"

packages/api/src/api/schema.ts

@@ -222,6 +222,21 @@ export const CreateFollowRequestSchema = Schema.Struct({
   capability: OptionalString
 })
 
+export const ExchangeSubscribeRequestSchema = Schema.Struct({
+  target: Schema.String,
+  domain: OptionalString,
+  actor: OptionalString,
+  inbox: OptionalString,
+  projectRepoUrl: OptionalString,
+  agentProvider: Schema.optional(AgentProviderSchema),
+  agentCommand: OptionalString
+})
+
+export const ExchangePollRequestSchema = Schema.Struct({
+  target: OptionalString,
+  runTasks: OptionalBoolean
+})
+
 export const AgentSessionSchema = Schema.Struct({
   id: Schema.String,
   projectId: Schema.String,
@@ -254,6 +269,7 @@ export const TerminalSessionSchema = Schema.Struct({
   sshCommand: Schema.String,
   status: TerminalSessionStatusSchema,
   createdAt: Schema.String,
+  attachedClients: Schema.optional(Schema.Number),
   startedAt: OptionalString,
   closedAt: OptionalString,
   exitCode: Schema.optional(Schema.Number),