Merge remote-tracking branch 'origin/master' into codex/agent-session-jsonl-location

# Conflicts: # docs/module-graph.md # docs/tool-catalog.md # examples/acp-agent/tests/snapshots/both-mode-turn/session.jsonl # examples/acp-agent/tests/snapshots/code-mode-turn/session.jsonl # examples/acp-agent/tests/snapshots/text-turn/session.jsonl # packages/bash/tool-bash/README.md # packages/bash/tool-bash/package.json # packages/bash/tool-bash/src/index.ts # packages/cordis/tool-cordis/src/api-catalog.ts
2026-07-11 22:57:27 +08:00
parent 869f94d9d8 7331720c8a
commit e1f317dcce
@@ -56,7 +56,7 @@ export const SERVICE_API: readonly ServiceApiEntry[] = [
    key: 'agentLoop',
    summary: 'The agent-loop plugin (`ctx.agentLoop`): creates ReactLoopAgents, runs their loops, and registers them in `ctx.agents`.',
    methods: [
-      'create(id: AgentId, options: AgentOptions = {}): ReactLoopAgent',
+      'create(id: AgentId, options: AgentOptions = {}, meta: Pick<SessionHeader, \'cwd\'> = {}): ReactLoopAgent',
      'createAgent(options: CreateAgentOptions): AgentHandle',
      'async resume(options: ResumeAgentOptions): Promise<AgentHandle>',
    ],
@@ -73,6 +73,13 @@ export const SERVICE_API: readonly ServiceApiEntry[] = [
      'list(): Agent[]',
    ],
  },
+  {
+    key: 'approval',
+    summary: 'The `ctx.approval` service: dispatches ApprovalRequests to the `approval/request` waterfall and audits every ask/outcome pair to the requesting agent\'s session log.',
+    methods: [
+      'async request(req: ApprovalRequest): Promise<ApprovalOutcome>',
+    ],
+  },
  {
    key: 'bash',
    summary: 'Abstract bash execution service.',
@@ -125,6 +132,13 @@ export const SERVICE_API: readonly ServiceApiEntry[] = [
      'stream(options: GenerateOptions): AsyncIterable<StreamChunk>',
    ],
  },
+  {
+    key: 'sandbox',
+    summary: 'Abstract process-sandbox service.',
+    methods: [
+      'abstract confine(argv: readonly string[], policy: SandboxPolicy): ConfinedArgv',
+    ],
+  },
  {
    key: 'sessionPersistence',
    summary: 'Abstract durable session-persistence service.',
@@ -149,6 +163,16 @@ export const SERVICE_API: readonly ServiceApiEntry[] = [
      'fork(source: SessionForkSource, boundary?: number, childSessionId?: SessionId): Session',
    ],
  },
+  {
+    key: 'skills',
+    summary: 'Registry of skill providers.',
+    methods: [
+      'registerProvider(provider: SkillProvider): () => void',
+      'register(skill: SkillRegistration): () => void',
+      'async list(options: SkillLookupOptions = {}): Promise<SkillSummary[]>',
+      'async get(name: string, options: SkillLookupOptions = {}): Promise<SkillDefinition | undefined>',
+    ],
+  },
  {
    key: 'subagents',
    summary: 'The `subagents` service: a registry of named SubagentProviders and a capability-checked start surface.',
@@ -280,6 +304,12 @@ export const EVENT_API: readonly EventApiEntry[] = [
    signature: '\'agent/turn-continuation\'(agent: Agent, turn: number, defaultDecision: ContinuationDecision, next: () => Promise<ContinuationDecision>): Promise<ContinuationDecision>',
    summary: 'Waterfall: override the turn-continuation decision via a typed ContinuationDecision.',
  },
+  {
+    name: 'approval/request',
+    mode: 'waterfall',
+    signature: '\'approval/request\'(this: ApprovalService, req: ApprovalRequest, next: () => Promise<ApprovalOutcome>): Promise<ApprovalOutcome>',
+    summary: 'Waterfall asking the composed answerers to decide one approval request.',
+  },
  {
    name: 'fs/edit-intent',
    mode: 'waterfall',
@@ -322,6 +352,18 @@ export const EVENT_API: readonly EventApiEntry[] = [
    signature: '\'session/flush\'(session: Session): Promise<void> | void',
    summary: 'Awaited durability checkpoint.',
  },
+  {
+    name: 'skill/provider-added',
+    mode: 'emit',
+    signature: '\'skill/provider-added\'(provider: SkillProvider): void',
+    summary: 'A skill provider became resolvable in the `ctx.skills` registry.',
+  },
+  {
+    name: 'skill/provider-removed',
+    mode: 'emit',
+    signature: '\'skill/provider-removed\'(name: string): void',
+    summary: 'A skill provider left the registry because its plugin fiber was disposed.',
+  },
  {
    name: 'subagent/end',
    mode: 'emit',
@@ -446,6 +488,14 @@ export const TYPE_API: readonly TypeApiEntry[] = [
    name: 'AgentStatus',
    declaration: 'export type AgentStatus = \'idle\' | \'running\' | \'disposed\';',
  },
+  {
+    name: 'ApprovalOutcome',
+    declaration: 'export type ApprovalOutcome = \'allowed-once\' | \'rejected\' | \'cancelled\' | \'unavailable\';',
+  },
+  {
+    name: 'ApprovalRequest',
+    declaration: 'export interface ApprovalRequest {\n    agent: Agent;\n    toolName: string;\n    callId?: CallId;\n    reason?: string;\n    signal?: AbortSignal;\n}',
+  },
  {
    name: 'AskUserQuestionAnswer',
    declaration: 'export interface AskUserQuestionAnswer {\n    answers: AskUserQuestionAnswerItem[];\n}',
@@ -476,19 +526,23 @@ export const TYPE_API: readonly TypeApiEntry[] = [
  },
  {
    name: 'BashExecRequest',
-    declaration: 'export interface BashExecRequest {\n    command: string;\n    workdir?: string | undefined;\n    timeoutMs?: number | undefined;\n    signal?: AbortSignal | undefined;\n    stdin?: string | undefined;\n    env?: Record<string, string> | undefined;\n    owner?: OwnerToken | undefined;\n}',
+    declaration: 'export interface BashExecRequest {\n    command: string;\n    workdir?: string | undefined;\n    timeoutMs?: number | undefined;\n    signal?: AbortSignal | undefined;\n    stdin?: string | undefined;\n    env?: Record<string, string> | undefined;\n    owner?: OwnerToken | undefined;\n    sandboxMode?: SandboxMode | undefined;\n}',
  },
  {
    name: 'BashExecSpec',
-    declaration: 'export interface BashExecSpec {\n    command: string;\n    workdir: string;\n    timeoutMs: number;\n    signal?: AbortSignal | undefined;\n    stdin?: string | undefined;\n    env?: Record<string, string> | undefined;\n    owner: OwnerToken | undefined;\n}',
+    declaration: 'export interface BashExecSpec {\n    command: string;\n    workdir: string;\n    timeoutMs: number;\n    signal?: AbortSignal | undefined;\n    stdin?: string | undefined;\n    env?: Record<string, string> | undefined;\n    owner: OwnerToken | undefined;\n    sandboxMode: SandboxMode | undefined;\n}',
  },
  {
    name: 'BashRunResult',
-    declaration: 'export interface BashRunResult {\n    exitCode: number | null;\n    signal: NodeJS.Signals | null;\n    timedOut: boolean;\n    aborted: boolean;\n    timeoutMs: number;\n    stdout: CollectedOutput;\n    stderr: CollectedOutput;\n}',
+    declaration: 'export interface BashRunResult {\n    exitCode: number | null;\n    signal: NodeJS.Signals | null;\n    timedOut: boolean;\n    aborted: boolean;\n    timeoutMs: number;\n    stdout: CollectedOutput;\n    stderr: CollectedOutput;\n    sandbox?: BashSandboxInfo;\n}',
+  },
+  {
+    name: 'BashSandboxInfo',
+    declaration: 'export interface BashSandboxInfo {\n    mode: SandboxMode;\n    denied: boolean;\n    enforcement?: SandboxEnforcement;\n    runnerFailed?: boolean;\n}',
  },
  {
    name: 'BashTask',
-    declaration: 'export interface BashTask {\n    readonly id: BashTaskId;\n    readonly command: string;\n    status: BashTaskStatus;\n    exitCode: number | null;\n    signal: NodeJS.Signals | null;\n    readonly done: Promise<void>;\n}',
+    declaration: 'export interface BashTask {\n    readonly id: BashTaskId;\n    readonly command: string;\n    status: BashTaskStatus;\n    exitCode: number | null;\n    signal: NodeJS.Signals | null;\n    readonly done: Promise<void>;\n    sandbox?: BashSandboxInfo;\n}',
  },
  {
    name: 'BashTaskId',
@@ -550,6 +604,14 @@ export const TYPE_API: readonly TypeApiEntry[] = [
    name: 'CompactionResult',
    declaration: 'export interface CompactionResult {\n    startSeq: number;\n    summarySeq: number;\n    endSeq: number;\n    summary: ContentBlock[];\n    shadowedRange: {\n        start: number;\n        end: number;\n    };\n    shadowedSeqs: number[];\n    shadowedTokenCount: number;\n}',
  },
+  {
+    name: 'ConfinedArgv',
+    declaration: 'export interface ConfinedArgv {\n    argv: string[];\n    enforcement: SandboxEnforcement;\n    denialSignatures: readonly string[];\n    runnerFailureSignatures: readonly string[];\n}',
+  },
+  {
+    name: 'ConfinedSandboxMode',
+    declaration: 'export type ConfinedSandboxMode = Exclude<SandboxMode, \'danger-full-access\'>;',
+  },
  {
    name: 'ContentBlockMap',
    declaration: 'export interface ContentBlockMap {\n    \'text\': TextBlock;\n    \'reasoning\': ReasoningBlock;\n    \'tool-call\': ToolCallBlock;\n    \'tool-result\': ToolResultBlock;\n}',
@@ -674,6 +736,18 @@ export const TYPE_API: readonly TypeApiEntry[] = [
    name: 'ResumeAgentOptions',
    declaration: 'export interface ResumeAgentOptions {\n    agentId: AgentId;\n    resumeSessionId: SessionId;\n    agentOptions?: AgentOptions;\n}',
  },
+  {
+    name: 'SandboxEnforcement',
+    declaration: 'export type SandboxEnforcement = \'full\' | \'partial\';',
+  },
+  {
+    name: 'SandboxMode',
+    declaration: 'export type SandboxMode = \'read-only\' | \'workspace-write\' | \'danger-full-access\';',
+  },
+  {
+    name: 'SandboxPolicy',
+    declaration: 'export interface SandboxPolicy {\n    mode: ConfinedSandboxMode;\n    workspaceRoot: string;\n}',
+  },
  {
    name: 'SendOptions',
    declaration: 'export interface SendOptions {\n    source?: MessageSource;\n}',
@@ -706,6 +780,38 @@ export const TYPE_API: readonly TypeApiEntry[] = [
    name: 'SessionLocation',
    declaration: 'export interface SessionLocation {\n    readonly kind: string;\n    readonly path: string;\n}',
  },
+  {
+    name: 'SkillCandidate',
+    declaration: 'export interface SkillCandidate extends SkillSummary {\n    rank: number;\n    locator: unknown;\n    path?: string;\n    metadata?: Record<string, unknown>;\n}',
+  },
+  {
+    name: 'SkillDefinition',
+    declaration: 'export interface SkillDefinition extends SkillSummary {\n    content: string;\n    path?: string;\n    metadata?: Record<string, unknown>;\n}',
+  },
+  {
+    name: 'SkillLookupOptions',
+    declaration: 'export interface SkillLookupOptions {\n    cwd?: string | undefined;\n    signal?: AbortSignal | undefined;\n}',
+  },
+  {
+    name: 'SkillProvider',
+    declaration: 'export interface SkillProvider {\n    name: string;\n    list(options: SkillLookupOptions): Promise<SkillCandidate[]>;\n    get(candidate: SkillCandidate, options: SkillLookupOptions): Promise<SkillDefinition | undefined>;\n}',
+  },
+  {
+    name: 'SkillRegistration',
+    declaration: 'export type SkillRegistration = Omit<SkillDefinition, \'provider\'> & {\n    provider?: string;\n};',
+  },
+  {
+    name: 'SkillResourceBase',
+    declaration: 'export type SkillResourceBase = {\n    kind: \'directory\';\n    path: string;\n} | {\n    kind: \'url\';\n    url: string;\n} | {\n    kind: \'opaque\';\n    description: string;\n};',
+  },
+  {
+    name: 'SkillSource',
+    declaration: 'export type SkillSource = \'project-dsh\' | \'project-agents\' | \'runtime\' | \'user-dsh\' | \'user-agents\' | \'custom\' | (string & {});',
+  },
+  {
+    name: 'SkillSummary',
+    declaration: 'export interface SkillSummary {\n    name: string;\n    description: string;\n    whenToUse?: string;\n    disableModelInvocation?: boolean;\n    source: SkillSource;\n    provider: string;\n    resourceBase?: SkillResourceBase;\n}',
+  },
  {
    name: 'StreamChunk',
    declaration: 'export type StreamChunk = {\n    type: \'block-start\';\n    index: number;\n    blockType: ContentBlockType;\n} | {\n    type: \'text-delta\';\n    index: number;\n    text: string;\n} | {\n    type: \'reasoning-delta\';\n    index: number;\n    text: string;\n} | {\n    type: \'tool-call-delta\';\n    index: number;\n    id: CallId;\n    name?: string;\n    argumentsDelta: string;\n} | {\n    type: \'block-end\';\n    index: number;\n    block: ContentBlock;\n} | {\n    type: \'usage\';\n    usage: TokenUsage;\n} | {\n    type: \'finish\';\n    reason: FinishReason;\n};',