@ai-sdk/harness-opencode 1.0.102 → 1.0.104

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @ai-sdk/harness-opencode
 
+## 1.0.104
+
+### Patch Changes
+
+- eeed977: feat(harness): allow passing arbitrary headers with inference requests via `headers` property in `HarnessAgentSettings`
+- a39c8bf: chore(harness): clarify `writeSkills` helper intent to require materializing skills in HOME directory
+- Updated dependencies [fe86f8f]
+- Updated dependencies [255cccf]
+- Updated dependencies [eeed977]
+- Updated dependencies [a39c8bf]
+  - @ai-sdk/harness@1.0.102
+
+## 1.0.103
+
+### Patch Changes
+
+- 951c54d: feat(harness): support `askUserQuestions` tool including support for normalization across harness adapters
+- Updated dependencies [951c54d]
+  - @ai-sdk/harness@1.0.101
+
 ## 1.0.102
 
 ### Patch Changes

package/dist/bridge/index.mjs

@@ -214,6 +214,7 @@ async function runBridge(options) {
     }
   }
   const pendingToolResults = /* @__PURE__ */ new Map();
+  const bufferedToolResults = [];
   const pendingToolApprovals = /* @__PURE__ */ new Map();
   const writeBridgeMeta = async (state) => {
     try {
@@ -393,9 +394,23 @@ async function runBridge(options) {
         const userMessages = createBridgeUserMessageQueue({ respond: emit });
         const turn = {
           emit,
-          requestToolResult: (toolCallId) => new Promise((resolve) => {
-            pendingToolResults.set(toolCallId, resolve);
-          }),
+          requestToolResult: (requestInput) => {
+            const request = typeof requestInput === "string" ? { toolCallId: requestInput } : requestInput;
+            const bufferedIndex = bufferedToolResults.findIndex(
+              (buffered) => buffered.toolCallId === request.toolCallId || request.matches?.(buffered.result) === true
+            );
+            if (bufferedIndex >= 0) {
+              return Promise.resolve(
+                bufferedToolResults.splice(bufferedIndex, 1)[0].result
+              );
+            }
+            return new Promise((resolve) => {
+              pendingToolResults.set(request.toolCallId, {
+                resolve,
+                matches: request.matches
+              });
+            });
+          },
           requestToolApproval: (approvalId) => new Promise((resolve) => {
             pendingToolApprovals.set(approvalId, resolve);
           }),
@@ -437,10 +452,25 @@ async function runBridge(options) {
         return;
       }
       case "tool-result": {
-        const resolver = pendingToolResults.get(msg.toolCallId);
-        if (resolver) {
-          pendingToolResults.delete(msg.toolCallId);
-          resolver({ output: msg.output, isError: msg.isError });
+        const result = {
+          output: msg.output,
+          isError: msg.isError,
+          toolResult: msg.toolResult
+        };
+        const exactPending = pendingToolResults.get(msg.toolCallId);
+        const matchingPending = exactPending == null ? Array.from(pendingToolResults.entries()).find(
+          ([, pending2]) => pending2.matches?.(result) === true
+        ) : void 0;
+        const pending = exactPending ?? matchingPending?.[1];
+        const pendingId = exactPending != null ? msg.toolCallId : matchingPending?.[0];
+        if (pending != null && pendingId != null) {
+          pendingToolResults.delete(pendingId);
+          pending.resolve(result);
+        } else {
+          bufferedToolResults.push({
+            toolCallId: msg.toolCallId,
+            result
+          });
         }
         return;
       }
@@ -1144,7 +1174,9 @@ function createEmitStreamEvent({
     if (type === "session.next.tool.called") {
       const callID = String(props.callID ?? event.id);
       const rawToolName = String(props.tool ?? "unknown");
-      if (rawToolName === "StructuredOutput") return;
+      if (rawToolName === "StructuredOutput" || rawToolName === "question") {
+        return;
+      }
       const toolName = toWireToolName2(rawToolName);
       state.toolNames.set(callID, { rawToolName, toolName });
       const hostToolName = getHostToolName2(toolName, props.tool);
@@ -1173,7 +1205,9 @@ function createEmitStreamEvent({
       const callID = String(props.callID ?? event.id);
       const cachedTool = state.toolNames.get(callID);
       const rawToolName = cachedTool?.rawToolName ?? String(props.tool ?? "");
-      if (rawToolName === "StructuredOutput") return;
+      if (rawToolName === "StructuredOutput" || rawToolName === "question") {
+        return;
+      }
       const toolName = cachedTool?.toolName ?? toWireToolName2(rawToolName || "unknown");
       if (getHostToolName2(toolName, rawToolName)) return;
       emit({
@@ -1293,7 +1327,7 @@ function emitLegacyToolPart({
   }
   const callID = toolPart.callID;
   const rawToolName = toolPart.tool;
-  if (rawToolName === "StructuredOutput") return;
+  if (rawToolName === "StructuredOutput" || rawToolName === "question") return;
   const toolName = toWireToolName2(rawToolName);
   if (toolName === "agent") {
     const metadata = {
@@ -1642,6 +1676,54 @@ function closeServer(server) {
   }
 }
 
+// src/bridge/question-tool.ts
+function openCodeQuestionKey(nativeRequest) {
+  return JSON.stringify(nativeRequest.questions);
+}
+function toHarnessQuestionsInput(nativeRequest) {
+  return {
+    allowPartialAnswers: true,
+    questions: nativeRequest.questions.map((question, questionIndex) => ({
+      id: `question-${questionIndex + 1}`,
+      question: question.question,
+      header: question.header,
+      options: question.options.map((option, optionIndex) => ({
+        id: `option-${optionIndex + 1}`,
+        label: option.label,
+        description: option.description
+      })),
+      ...question.multiple !== void 0 ? { allowMultiple: question.multiple } : {},
+      ...question.custom !== void 0 ? { allowFreeForm: question.custom } : {}
+    }))
+  };
+}
+function toOpenCodeQuestionResponse(input) {
+  if (input.output.action === "declined" || input.output.action === "cancelled") {
+    return { action: "reject" };
+  }
+  const answers = input.nativeRequest.questions.map(
+    (nativeQuestion, questionIndex) => {
+      const answer = input.output.action === "answered" || input.output.action === "partially-answered" ? input.output.answers[`question-${questionIndex + 1}`] : void 0;
+      if (answer == null) return [];
+      const selectedLabels = answer.optionIds.flatMap((optionId) => {
+        const index = positionalIdIndex({
+          id: optionId,
+          prefix: "option-"
+        });
+        const option = index == null ? void 0 : nativeQuestion.options[index];
+        return option == null ? [] : [option.label];
+      });
+      return answer.freeform === void 0 ? selectedLabels : [...selectedLabels, answer.freeform];
+    }
+  );
+  return { action: "reply", answers };
+}
+function positionalIdIndex(input) {
+  if (!input.id.startsWith(input.prefix)) return void 0;
+  const oneBasedIndex = Number(input.id.slice(input.prefix.length));
+  return Number.isInteger(oneBasedIndex) && oneBasedIndex > 0 ? oneBasedIndex - 1 : void 0;
+}
+
 // src/bridge/index.ts
 var NATIVE_TO_COMMON = {
   view: "read",
@@ -1650,7 +1732,8 @@ var NATIVE_TO_COMMON = {
   edit: "edit",
   bash: "bash",
   glob: "glob",
-  grep: "grep"
+  grep: "grep",
+  question: "askUserQuestions"
 };
 var OPENCODE_TO_WIRE = {
   list: "ls",
@@ -1658,6 +1741,7 @@ var OPENCODE_TO_WIRE = {
   webfetch: "webfetch",
   task: "agent",
   agent: "agent",
+  askUserQuestions: "question",
   subtask: "agent"
 };
 var PUBLIC_TO_NATIVE = {
@@ -1803,7 +1887,7 @@ function buildOpenCodeConfig({
       webfetch: "ask",
       doom_loop: "ask",
       task: "ask",
-      question: "deny"
+      question: "allow"
     }
   };
   if (start.model) config.model = start.model;
@@ -1871,7 +1955,12 @@ function buildProviderConfig(start) {
         options: {
           apiKey: procEnv2.AI_GATEWAY_API_KEY,
           baseURL: toOpenCodeGatewayBaseUrl(procEnv2.AI_GATEWAY_BASE_URL),
-          ...HARNESS_CLIENT_APP ? { headers: { "x-client-app": HARNESS_CLIENT_APP } } : {}
+          ...HARNESS_CLIENT_APP ? {
+            headers: {
+              ...start.headers,
+              "x-client-app": HARNESS_CLIENT_APP
+            }
+          } : start.headers ? { headers: start.headers } : {}
         },
         ...modelID ? {
           models: {
@@ -1888,6 +1977,7 @@ function buildProviderConfig(start) {
         options: {
           ...procEnv2.OPENAI_API_KEY ? { apiKey: procEnv2.OPENAI_API_KEY } : {},
           ...procEnv2.OPENAI_BASE_URL ? { baseURL: procEnv2.OPENAI_BASE_URL } : {},
+          ...start.headers ? { headers: start.headers } : {},
           ...parseOpenAIQueryParams()
         },
         ...modelID ? {
@@ -1904,7 +1994,8 @@ function buildProviderConfig(start) {
         options: {
           ...procEnv2.ANTHROPIC_API_KEY ? { apiKey: procEnv2.ANTHROPIC_API_KEY } : {},
           ...procEnv2.ANTHROPIC_AUTH_TOKEN ? { authToken: procEnv2.ANTHROPIC_AUTH_TOKEN } : {},
-          ...procEnv2.ANTHROPIC_BASE_URL ? { baseURL: procEnv2.ANTHROPIC_BASE_URL } : {}
+          ...procEnv2.ANTHROPIC_BASE_URL ? { baseURL: procEnv2.ANTHROPIC_BASE_URL } : {},
+          ...start.headers ? { headers: start.headers } : {}
         }
       }
     };
@@ -1917,6 +2008,7 @@ function buildProviderConfig(start) {
           ...procEnv2.OPENAI_BASE_URL ? { baseURL: procEnv2.OPENAI_BASE_URL } : {},
           ...procEnv2.OPENAI_ORGANIZATION ? { organization: procEnv2.OPENAI_ORGANIZATION } : {},
           ...procEnv2.OPENAI_PROJECT ? { project: procEnv2.OPENAI_PROJECT } : {},
+          ...start.headers ? { headers: start.headers } : {},
           ...parseOpenAIQueryParams()
         }
       }
@@ -2434,7 +2526,14 @@ async function consumeEvents({
     const scopedSessionId = !eventSessionId || eventSessionId === sessionId ? sessionId : taskSessionIds.has(eventSessionId) ? eventSessionId : void 0;
     if (!scopedSessionId) continue;
     const isDescendant = scopedSessionId !== sessionId;
-    if (event.type === "permission.v2.asked") {
+    if (event.type === "question.asked") {
+      await handleQuestion({
+        client,
+        turn,
+        emit,
+        event
+      });
+    } else if (event.type === "permission.v2.asked") {
       await handlePermissionV2({
         client,
         sessionId: scopedSessionId,
@@ -2472,6 +2571,56 @@ function getSubagentStepId(event) {
   if (event?.type !== "session.next.step.ended") return void 0;
   return stringValue2(event.properties?.stepID) ?? event.id;
 }
+async function handleQuestion({
+  client,
+  turn,
+  emit,
+  event
+}) {
+  const nativeRequest = event.properties;
+  if (nativeRequest == null || typeof nativeRequest.id !== "string" || typeof nativeRequest.sessionID !== "string" || !Array.isArray(nativeRequest.questions)) {
+    return;
+  }
+  const toolCallId = nativeRequest.tool?.callID ?? nativeRequest.id;
+  emit({
+    type: "tool-call",
+    toolCallId,
+    toolName: "askUserQuestions",
+    nativeName: "question",
+    input: JSON.stringify(toHarnessQuestionsInput(nativeRequest)),
+    providerExecuted: false,
+    providerMetadata: {
+      opencode: {
+        nativeRequest
+      }
+    }
+  });
+  const questionKey = openCodeQuestionKey(nativeRequest);
+  const result = await turn.requestToolResult({
+    toolCallId,
+    matches: (candidate) => {
+      const continuedRequest = candidate.toolResult?.providerOptions?.opencode?.nativeRequest;
+      return continuedRequest != null && openCodeQuestionKey(continuedRequest) === questionKey;
+    }
+  });
+  const nativeResponse = toOpenCodeQuestionResponse({
+    nativeRequest,
+    output: result.output
+  });
+  const response = nativeResponse.action === "reject" ? await client.question.reject({
+    requestID: nativeRequest.id,
+    directory: workdir
+  }) : await client.question.reply({
+    requestID: nativeRequest.id,
+    directory: workdir,
+    answers: nativeResponse.answers
+  });
+  if (response.error != null) {
+    throw new Error(
+      `OpenCode question response failed: ${formatError(response.error)}`
+    );
+  }
+}
 function sanitizeMcpToolName(value) {
   return value.replace(/[^a-zA-Z0-9_-]/g, "_");
 }