@gitterm/sdk 0.1.3 → 0.2.1

package/dist/types.d.ts

@@ -58,13 +58,10 @@ export type Workspace = {
 export type WorkspaceRef = string | {
     id: string;
 };
-/** A run id pair, or any object carrying one (e.g. an `AgentRun`). */
+/** An `AgentRun`, or any object carrying its `workspaceId` and `id`. */
 export type RunRef = {
     workspaceId: string;
     id: string;
-} | {
-    workspaceId: string;
-    runId: string;
 };
 /** `v1` = OpenCode 1.x (`/event`, `/session/*`); `v2` = OpenCode 2 (`/api/*`), experimental until 2.0 ships. */
 export type OpencodeApi = "v1" | "v2";
@@ -234,12 +231,8 @@ export type WorkspaceCreateInput = {
     /** Defaults from the selected provider. */
     persistent?: boolean;
     workspaceProfile?: "standard" | "ssh-enabled";
-    /**
-     * One entry per provider. Omit entirely to inject the dashboard defaults.
-     * Naming any dashboard credential (an entry without `apiKey`) turns off the
-     * implicit defaults, so list every provider the workspace needs.
-     */
-    modelCredentials?: WorkspaceModelCredentialInput[];
+    /** Omit to use dashboard defaults. An explicit block inherits nothing unless requested. */
+    models?: WorkspaceModelsInput;
     /** Ephemeral environment variables injected into this workspace only. */
     environmentVariables?: Record<string, string>;
     /**
@@ -297,11 +290,11 @@ export type WorkspaceEnsureRunningResult = {
 export type AgentRunStatus = "pending" | "running" | "retrying"
 /** Blocked on a permission prompt or agent question; answer with `runs.respond()`. */
  | "awaiting_input" | "completed" | "failed" | "cancelled";
-/** A prompt the agent is blocked on. `permission` = OpenCode tool approval; `question` = the agent's `question` tool. */
-export type AgentRunInputRequest = {
+/** OpenCode asked to run a tool your `permission` config does not pre-approve. */
+export type AgentPermissionRequest = {
     id: string;
     kind: "permission";
-    createdAt: string;
+    createdAt: string | null;
     toolCallId: string | null;
     /** Permission action, e.g. "bash" or "edit". */
     permission: string;
@@ -310,34 +303,47 @@ export type AgentRunInputRequest = {
     /** Patterns OpenCode remembers when answered with "always". */
     always: string[];
     title: string;
-} | {
+};
+/** One choice to show the user. Answer with the `label`. */
+export type AgentQuestionOption = {
+    label: string;
+    description: string;
+};
+export type AgentQuestion = {
+    /** Identifies this question in `AgentRunReply.answers`. Unique within a request. */
+    key: string;
+    header: string;
+    question: string;
+    options: AgentQuestionOption[];
+    /** More than one option may be selected. */
+    multiple: boolean;
+    /**
+     * A free-text answer outside `options` is accepted.
+     * Defaults to true, matching OpenCode; false only when the agent sets it.
+     */
+    custom: boolean;
+};
+/** The agent called OpenCode's `question` tool. Answer every question in one reply. */
+export type AgentQuestionRequest = {
     id: string;
     kind: "question";
-    createdAt: string;
+    createdAt: string | null;
     toolCallId: string | null;
-    questions: Array<{
-        key: string;
-        header: string;
-        question: string;
-        options: Array<{
-            label: string;
-            description: string;
-            value?: string;
-        }>;
-        /** More than one option may be selected. */
-        multiple: boolean;
-        /** A free-text answer outside `options` is accepted. */
-        custom: boolean;
-    }>;
+    questions: AgentQuestion[];
 };
+/** A prompt the agent is blocked on. */
+export type AgentRunInputRequest = AgentPermissionRequest | AgentQuestionRequest;
 export type AgentRunReply = {
     type: "permission";
     response: "once" | "always" | "reject";
 }
-/** One entry per question, each the selected option labels (or a custom answer when allowed). */
+/**
+ * Keyed by `AgentQuestion.key`, each the selected option labels (or a single
+ * custom answer when the question allows one). Every question needs a key.
+ */
  | {
     type: "question";
-    answers: string[][];
+    answers: Record<string, string[]>;
 } | {
     type: "question";
     reject: true;
@@ -349,7 +355,11 @@ export type AgentRun = {
     status: AgentRunStatus;
     error: string | null;
     finalText: string | null;
-    /** Non-empty exactly while `status` is `awaiting_input`. */
+    /**
+     * Non-empty exactly while `status` is `awaiting_input`. Usually one request;
+     * several when the agent issued parallel tool calls that each need approval.
+     * Answer each with `runs.respond()`; the run resumes once none remain.
+     */
     pendingInputs: AgentRunInputRequest[];
     context: {
         type: "isolated";
@@ -379,7 +389,7 @@ export type AgentRunListResult = {
     };
 };
 export type AgentRunCreateInput = {
-    workspaceId: string;
+    workspace: WorkspaceRef;
     /**
      * Stable key used to return the same run when a request is retried.
      * Defaults to a random UUID, which gives no retry protection; pass your own
@@ -396,7 +406,7 @@ export type AgentRunCreateInput = {
         type: "isolated";
     } | {
         type: "continue";
-        runId: string;
+        run: RunRef;
     };
     /**
      * Wait for the `afterAgent` setup phase to succeed before submitting the
@@ -430,17 +440,53 @@ export type AgentRunMessagePart = {
     startedAt: string | null;
     completedAt: string | null;
 };
-export type RunWaitOptions = {
-    /** Default 30 minutes. */
-    timeoutMs?: number;
-    /** Abort the wait early; the promise rejects with code `ABORTED`. */
+export type RunWatchOptions = {
+    /** Stop the stream early; the iterator throws with code `ABORTED`. */
     signal?: AbortSignal;
+};
+export type RunWaitOptions = RunWatchOptions & {
+    /** Default 30 minutes. When it elapses the promise rejects with code `TIMEOUT`. */
+    timeoutMs?: number;
     /**
      * `input-or-terminal` (default) also returns when the run is `awaiting_input`
      * so the caller can answer with `runs.respond()`; `terminal` keeps waiting.
      */
     until?: "input-or-terminal" | "terminal";
 };
+export type AgentRunResult<T extends AgentRun = AgentRun> = T & {
+    status: "completed";
+};
+export type RunResultOptions = RunWatchOptions & {
+    /** Total deadline, including time spent in human-input handlers. Default 30 minutes. */
+    timeoutMs?: number;
+    onPermission?: (request: AgentPermissionRequest, options: {
+        signal: AbortSignal;
+    }) => AgentRunReplyPermission | Promise<AgentRunReplyPermission>;
+    onQuestion?: (request: AgentQuestionRequest, options: {
+        signal: AbortSignal;
+    }) => AgentRunReplyQuestion | Promise<AgentRunReplyQuestion>;
+};
+export type AgentRunReplyPermission = "once" | "always" | "reject";
+export type AgentRunReplyQuestion = {
+    answers: Record<string, string[]>;
+} | {
+    reject: true;
+};
+export type AgentRunEvent<T extends AgentRun = AgentRun> = {
+    type: "run.status";
+    run: T;
+} | {
+    type: "input.required";
+    run: T;
+    request: AgentRunInputRequest;
+} | {
+    type: "input.resolved";
+    run: T;
+    requestId: string;
+} | {
+    type: "run.completed" | "run.failed" | "run.cancelled";
+    run: T;
+};
 export type AgentRunMessage = {
     id: string;
     role: "user" | "assistant";
@@ -473,31 +519,48 @@ export type WorkspaceSetupStatus = {
 export type ModelProviderInfo = {
     id: string;
     name: string;
+    /** Use this key in models.providers and provider/model references. */
+    logicalProviderKey: string;
     displayName: string;
     authType: string;
     isRecommended: boolean;
 };
-/**
- * Selects the credential for one provider on workspaces.create().
- * `providerName` comes from credentials.listProviders(), e.g. "anthropic" or
- * "openai"; unknown providers throw MODEL_CREDENTIAL_INVALID.
- *
- * - `{ providerName, apiKey }` — inline key for this workspace only, never
- *   stored. Overrides any dashboard credential for the same provider.
- *   OAuth-only providers throw MODEL_CREDENTIAL_INVALID.
- * - `{ providerName, label }` — the dashboard credential with that label.
- *   Unknown labels throw MODEL_CREDENTIAL_UNAVAILABLE listing the labels
- *   that exist.
- * - `{ providerName }` — that provider's dashboard default credential.
- */
-export type WorkspaceModelCredentialInput = {
-    providerName: string;
-    apiKey: string;
-    label?: never;
+export type ModelInfo = {
+    /** Full provider/model identifier accepted by runs.create(). */
+    id: string;
+    name: string;
+    provider: string;
+    isFree: boolean;
+    isRecommended: boolean;
+};
+/** Control-plane configuration, not a live authentication check. */
+export type WorkspaceModelAccess = {
+    providers: Array<{
+        provider: string;
+        source: "saved" | "apiKey";
+        label: string | null;
+        active: boolean;
+    }>;
+    /** Known catalog models whose provider is configured, plus free models. */
+    models: ModelInfo[];
+};
+/** Explicit credential intent. Saved sources use dashboard labels, never credential IDs. */
+export type ModelCredentialSource = {
+    source: "saved";
+    label: string;
 } | {
-    providerName: string;
-    label?: string;
-    apiKey?: never;
+    source: "default";
+} | {
+    source: "apiKey";
+    apiKey: string;
+};
+export type WorkspaceModelsInput = {
+    /** Workspace default, overridden by runs.create({ model }). */
+    default?: string;
+    /** Default for an explicit block is none. */
+    inherit?: "defaults" | "none";
+    /** Keys are model provider names (e.g. openai for API keys AND ChatGPT subscriptions). */
+    providers?: Record<string, ModelCredentialSource>;
 };
 /** Safe dashboard credential metadata. Secret material is never returned by the SDK. */
 export type ModelCredential = {
@@ -507,7 +570,7 @@ export type ModelCredential = {
     providerDisplayName: string;
     logicalProviderKey: string;
     authType: string;
-    /** Unique per provider; use it in `modelCredentials: [{ providerName, label }]`. */
+    /** Select with models.providers[logicalProviderKey] = { source: "saved", label }. */
     label: string;
     keyHash: string;
     isActive: boolean;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@gitterm/sdk",
-  "version": "0.1.3",
+  "version": "0.2.1",
   "files": [
     "dist"
   ],
@@ -39,6 +39,7 @@
     "eventsource": "^5.1.1"
   },
   "devDependencies": {
+    "@gitterm/agent-runtime": "workspace:*",
     "@gitterm/api": "workspace:*",
     "@trpc/server": "catalog:",
     "@types/bun": "^1.2.6",