@zixt/host 0.0.13 → 0.0.15

package/dist/index.js

@@ -31,7 +31,7 @@ import { homedir } from "node:os";
 // package.json
 var package_default = {
   name: "@zixt/host",
-  version: "0.0.13",
+  version: "0.0.15",
   type: "module",
   exports: {
     ".": "./src/client.ts",
@@ -14872,6 +14872,16 @@ var MemberApprovalRequestContext = ApprovalRequestContext.extend({
   }),
   acting: ApprovalRequestContext.shape.acting.extend({ providerPrincipal: external_exports.null() })
 });
+var QuestionChoice = external_exports.object({
+  label: external_exports.string().trim().min(1).max(120),
+  description: external_exports.string().trim().min(1).max(500).optional()
+}).strict();
+var QuestionChoices = external_exports.array(QuestionChoice).min(2).max(5).superRefine((choices, ctx) => {
+  const labels = choices.map(({ label }) => label.toLocaleLowerCase());
+  if (new Set(labels).size !== labels.length) {
+    ctx.addIssue({ code: "custom", message: "question choice labels must be unique" });
+  }
+});
 var Approval = external_exports.object({
   id: ApprovalId,
   orgId: OrgId,
@@ -14882,6 +14892,8 @@ var Approval = external_exports.object({
   summary: external_exports.string().min(1).max(500),
   /** The concrete action payload, rendered verbatim for review (GR-3). */
   payload: external_exports.string().max(5e4),
+  /** Present only when ask_user supplied a bounded multiple-choice question. */
+  questionChoices: QuestionChoices.optional(),
   status: ApprovalStatus,
   deliveryStatus: ApprovalDeliveryStatus,
   /** Why delivery became impossible; null while pending or after delivery. */
@@ -15334,13 +15346,19 @@ var CreateOrgRequest = external_exports.object({
 });
 var DESKTOP_SIDEBAR_MIN_WIDTH_PX = 240;
 var DESKTOP_SIDEBAR_MAX_WIDTH_PX = 420;
+var TASK_SIDEBAR_MIN_WIDTH_PX = 240;
+var TASK_SIDEBAR_MAX_WIDTH_PX = 480;
 var DesktopSidebarPreference = external_exports.object({
   collapsed: external_exports.boolean(),
   /** Last expanded width; collapsing never discards the user's chosen width. */
   expandedWidthPx: external_exports.number().int().min(DESKTOP_SIDEBAR_MIN_WIDTH_PX).max(DESKTOP_SIDEBAR_MAX_WIDTH_PX)
 });
+var TaskSidebarPreference = external_exports.object({
+  expandedWidthPx: external_exports.number().int().min(TASK_SIDEBAR_MIN_WIDTH_PX).max(TASK_SIDEBAR_MAX_WIDTH_PX)
+});
 var OrgUiPreferences = external_exports.object({
   desktopSidebar: DesktopSidebarPreference,
+  taskSidebar: TaskSidebarPreference,
   /** Missing legacy storage is revision zero. */
   revision: external_exports.number().int().min(0),
   updatedAt: IsoDate2.nullable()
@@ -15349,9 +15367,16 @@ var DesktopSidebarPreferencePatch = DesktopSidebarPreference.partial().refine(
   (value) => Object.keys(value).length > 0,
   "empty desktop sidebar update"
 );
+var TaskSidebarPreferencePatch = TaskSidebarPreference.partial().refine(
+  (value) => Object.keys(value).length > 0,
+  "empty task sidebar update"
+);
 var UpdateOrgUiPreferencesRequest = external_exports.object({
   expectedRevision: external_exports.number().int().min(0),
-  desktopSidebar: DesktopSidebarPreferencePatch
+  desktopSidebar: DesktopSidebarPreferencePatch.optional(),
+  taskSidebar: TaskSidebarPreferencePatch.optional()
+}).refine((value) => value.desktopSidebar !== void 0 || value.taskSidebar !== void 0, {
+  message: "at least one layout preference is required"
 });
 var ListOrgsResponse = external_exports.object({
   orgs: external_exports.array(Org.extend({ role: OrgRole, uiPreferences: OrgUiPreferences }))
@@ -15884,7 +15909,34 @@ var MemberTaskOriginProjection = TaskOrigin.pick({
 var MemberTaskCancellationProjection = TaskCancellation.omit({ hostId: true }).extend({
   hostId: external_exports.null()
 });
-var AdminTaskProjection = Task.extend({ metadataRedacted: external_exports.literal(false) });
+var taskGitSummaryLabel = (maxLength, label) => external_exports.string().min(1).max(maxLength).refine(
+  isSafeSingleLineDisplayText,
+  `${label} must not contain control, line-separator, or bidirectional formatting characters`
+);
+var TaskGitSummary = external_exports.object({
+  repositories: external_exports.array(
+    external_exports.object({
+      githubRepository: external_exports.string().regex(/^[A-Za-z0-9_.-]{1,100}\/[A-Za-z0-9_.-]{1,100}$/).optional(),
+      branch: taskGitSummaryLabel(512, "branch").nullable(),
+      ahead: external_exports.number().int().min(0),
+      behind: external_exports.number().int().min(0),
+      changedFiles: external_exports.number().int().min(0),
+      pullRequest: external_exports.object({
+        number: external_exports.number().int().min(1),
+        url: external_exports.string().max(2e3).regex(
+          /^https:\/\/github\.com\/[A-Za-z0-9_.-]{1,100}\/[A-Za-z0-9_.-]{1,100}\/pull\/[1-9][0-9]*$/
+        ),
+        state: external_exports.enum(["open", "closed", "merged"]),
+        draft: external_exports.boolean()
+      }).strict().optional()
+    }).strict()
+  ).min(1).max(20),
+  observedAt: IsoDate
+}).strict();
+var AdminTaskProjection = Task.extend({
+  metadataRedacted: external_exports.literal(false),
+  gitSummary: TaskGitSummary.nullable().optional()
+});
 var MemberTaskProjection = Task.omit({
   origin: true,
   hostId: true,
@@ -15893,7 +15945,8 @@ var MemberTaskProjection = Task.omit({
   metadataRedacted: external_exports.literal(true),
   origin: MemberTaskOriginProjection,
   hostId: external_exports.null(),
-  cancellation: MemberTaskCancellationProjection.nullable().default(null)
+  cancellation: MemberTaskCancellationProjection.nullable().default(null),
+  gitSummary: external_exports.null().optional()
 });
 var TaskProjection = external_exports.discriminatedUnion("metadataRedacted", [
   AdminTaskProjection,
@@ -18414,7 +18467,9 @@ var ApprovalRequest = external_exports.object({
   category: external_exports.string(),
   summary: external_exports.string().min(1).max(500),
   /** Concrete action payload rendered verbatim on the approval card (GR-3). */
-  payload: external_exports.string().max(5e4)
+  payload: external_exports.string().max(5e4),
+  /** Optional structured answers for agent.question; absent means free text. */
+  questionChoices: QuestionChoices.optional()
 });
 var JournalAppend = external_exports.object({
   type: external_exports.literal("journal.append"),
@@ -20524,7 +20579,7 @@ var HostClient = class _HostClient {
       const { provider: _provider, ...legacyGrant } = grant;
       return legacyGrant;
     };
-    const requestApproval = (category, summary, payload) => {
+    const requestApproval = (category, summary, payload, questionChoices) => {
       if (authorityController.signal.aborted) {
         return Promise.resolve({ approved: false, guidance: "task was cancelled" });
       }
@@ -20536,7 +20591,8 @@ var HostClient = class _HostClient {
         requestId,
         category: safe(category, 200),
         summary: safe(summary, 500),
-        payload: safe(payload, 5e4)
+        payload: safe(payload, 5e4),
+        ...questionChoices ? { questionChoices: [...questionChoices] } : {}
       });
       return new Promise((resolve13) => {
         const waiters = this.approvalWaiters.get(cancelKey) ?? /* @__PURE__ */ new Map();
@@ -30668,7 +30724,7 @@ var CADENCE_PROPS = {
 var TOOLS = [
   {
     name: "ask_user",
-    description: "Ask the human supervising this task a question and wait for their answer. Use it whenever you need a decision, missing context, or plan approval before proceeding. The answer arrives as text.",
+    description: "Ask the human supervising this task a question and wait for their answer. Use it whenever you need a decision, missing context, or plan approval before proceeding. When there are 2-5 concrete alternatives, provide them as choices; the person can still enter another answer. The answer arrives as text.",
     inputSchema: {
       type: "object",
       properties: {
@@ -30676,9 +30732,35 @@ var TOOLS = [
         context: {
           type: "string",
           description: "Optional supporting detail shown alongside the question."
+        },
+        choices: {
+          type: "array",
+          minItems: 2,
+          maxItems: 5,
+          description: "Optional concrete answers. Omit when the person should type freely.",
+          items: {
+            type: "object",
+            properties: {
+              label: {
+                type: "string",
+                minLength: 1,
+                maxLength: 120,
+                description: "Short answer label."
+              },
+              description: {
+                type: "string",
+                minLength: 1,
+                maxLength: 500,
+                description: "Optional consequence or detail that helps the person choose."
+              }
+            },
+            required: ["label"],
+            additionalProperties: false
+          }
         }
       },
-      required: ["question"]
+      required: ["question"],
+      additionalProperties: false
     }
   },
   {
@@ -31201,7 +31283,22 @@ function createAskUserServer() {
           }
           try {
             const context = typeof args["context"] === "string" ? args["context"] : "";
-            toolText(await handlers.askUser(question, context));
+            const rawChoices = args["choices"];
+            const parsedChoices = rawChoices === void 0 ? void 0 : QuestionChoices.safeParse(rawChoices);
+            if (parsedChoices && !parsedChoices.success) {
+              toolText(
+                "Choices must contain 2-5 unique, non-empty labels with optional descriptions.",
+                true
+              );
+              return;
+            }
+            toolText(
+              await handlers.askUser(
+                question,
+                context,
+                parsedChoices?.success ? parsedChoices.data : void 0
+              )
+            );
           } catch (err) {
             toolText(`The question could not be delivered: ${String(err)}`, true);
           }
@@ -33267,12 +33364,8 @@ function createCliRunner(adapter, opts = {}) {
       try {
         cwd = await requireRealDirectory4(configuredWorkspace, "configured workspace");
       } catch (error52) {
-        return {
-          outcome: "failed",
-          summary: error52 instanceof Error ? error52.message : "configured workspace is unusable",
-          summaryEvidence: "host_observed",
-          usage: { inputTokens: 0, outputTokens: 0 }
-        };
+        const reason = error52 instanceof Error ? error52.message : "configured workspace is unusable";
+        task.event("status", `${reason}. Continuing in the teammate folder instead.`);
       }
     }
     if (task.cancelledNow()) return cancelledBeforeRun();
@@ -33391,13 +33484,14 @@ function createCliRunner(adapter, opts = {}) {
         throw new Error("prepared provider workspace does not match the task assignment");
       }
       askUserServer.register(runToken, {
-        askUser: async (question, context) => {
+        askUser: async (question, context, choices) => {
           pendingAsks++;
           try {
             const decision = await task.requestApproval(
               "agent.question",
               question.slice(0, 500),
-              (context || question).slice(0, MAX_APPROVAL_PAYLOAD)
+              (context || question).slice(0, MAX_APPROVAL_PAYLOAD),
+              choices
             );
             return decision.guidance ?? (decision.approved ? "Approved. Proceed." : "No. Do not proceed.");
           } finally {
@@ -33426,6 +33520,18 @@ function createCliRunner(adapter, opts = {}) {
           ];
         })
       });
+      const workingContextEnvironments = buildWorkingContextCommandEnvironments({
+        inherited: process.env,
+        runnerEnv: env,
+        ...githubShell ? { githubShellBrokerEnv: githubShell.environment } : {}
+      });
+      const gitDetected = preparedWorkspace !== null || await collectWorkingContext({
+        workingDirectory: cwd,
+        preparedWorkspace,
+        git,
+        env: workingContextEnvironments.git,
+        signal: task.authoritySignal
+      }).then((context) => Boolean(context.repositories?.length)).catch(() => false);
       const prepared = await adapter.prepareRun({
         task,
         runner,
@@ -33436,6 +33542,7 @@ function createCliRunner(adapter, opts = {}) {
           connections: attachedConnections
         },
         preparedWorkspace,
+        gitDetected,
         // The trusted workspace facts describe where Zixt put provider clones,
         // which is always the Zixt-owned root — never a configured workspace.
         taskRoot,
@@ -33467,11 +33574,6 @@ ${attachmentSection}` : prepared.prompt;
       const abortWorkingContext = () => workingContextAbort.abort();
       task.authoritySignal.addEventListener("abort", abortWorkingContext, { once: true });
       const pullRequests = new WorkingContextPullRequestCache();
-      const workingContextEnvironments = buildWorkingContextCommandEnvironments({
-        inherited: process.env,
-        runnerEnv: env,
-        ...githubShell ? { githubShellBrokerEnv: githubShell.environment } : {}
-      });
       const ghContextCommand = githubShell?.ghCommand ? { ...githubShell.ghCommand, env: workingContextEnvironments.github } : void 0;
       const gitContextCommand = git.available && git.executablePath ? { executablePath: git.executablePath, env: workingContextEnvironments.git } : void 0;
       const reportWorkingContext = (options = {}) => {
@@ -33778,6 +33880,20 @@ function workspaceSystemPrompt(existing, workspacePath, siblings, gitDetected =
     "",
     "Your session ends the moment you finish a reply, and nothing wakes it: no background notification, watcher, or timer will ever re-invoke you. Run long commands (test gates, builds) synchronously and wait for their result inside the tool call. Never end a reply with work still in flight or a promise to report later: whatever you were waiting for dies with the turn. Your final reply is the report of record, written only when the work is actually complete."
   ];
+  if (gitDetected) {
+    lines.push(
+      "",
+      "# Finishing work in Git",
+      "",
+      "This folder is positively detected as a Git repository. Use installed `git` for local source control and, when the remote is GitHub, installed `gh` for pull requests, checks, and merges.",
+      "",
+      "Before editing, inspect the repository and call `list_tasks` to check whether another live Task overlaps this work. Never disturb another Task\u2019s checkout; use an isolated branch and worktree when work may be concurrent.",
+      "",
+      "Unless the human explicitly asked you to stop for review before merging, Git work is not complete merely because files, a branch, or a pull request exist. Update from the latest default branch, resolve ordinary conflicts yourself, run the relevant validation, commit, push, open or update the pull request when the repository uses them, wait for required checks, merge it, and verify the merged state. Clean up temporary worktrees after integration. Do not strand finished work on an unmerged branch.",
+      "",
+      "If repository policy, unavailable authority, an ambiguous product decision, or a conflict you cannot safely resolve prevents completion, use `ask_user` with the exact blocker and required decision. Do not report the Task as done while integration is still pending."
+    );
+  }
   if (siblings.length > 0) {
     const siblingData = promptDescriptiveJson(
       siblings.slice(0, 100).map((sibling) => ({
@@ -34316,7 +34432,8 @@ var claudeCodeAdapter = {
       input.mcp,
       input.preparedWorkspace,
       input.taskRoot,
-      input.cwd
+      input.cwd,
+      input.gitDetected
     );
     const sessionId = input.task.spec.sessionKey ?? randomUUID11();
     const observeRuntime = createRuntimeReporter(input, sessionId);
@@ -34367,7 +34484,7 @@ function delay2(ms) {
     timer.unref?.();
   });
 }
-async function buildArgs(task, runner, artifacts, mcp, preparedWorkspace, taskRoot, workspacePath = taskRoot ?? "") {
+async function buildArgs(task, runner, artifacts, mcp, preparedWorkspace, taskRoot, workspacePath = taskRoot ?? "", gitDetected = false) {
   const args = [
     // Hermetic, non-interactive run — no local slash commands or global state.
     "--disable-slash-commands",
@@ -34387,7 +34504,7 @@ async function buildArgs(task, runner, artifacts, mcp, preparedWorkspace, taskRo
     trustedWorkspaceSystemPrompt(task.spec.system, preparedWorkspace, taskRoot),
     workspacePath,
     task.siblingTasks(),
-    preparedWorkspace !== null
+    gitDetected
   );
   if (systemPrompt) {
     const promptPath = await artifacts.writeSystemPrompt(systemPrompt);
@@ -34641,7 +34758,7 @@ function createCodexAdapter(threadIndexRoot) {
         trustedWorkspaceSystemPrompt(task.spec.system, input.preparedWorkspace, input.taskRoot),
         input.cwd,
         task.siblingTasks(),
-        input.preparedWorkspace !== null
+        input.gitDetected
       );
       const prompt = platformInstructions ? `<zixt_platform_instructions>
 ${platformInstructions}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zixt/host",
-  "version": "0.0.13",
+  "version": "0.0.15",
   "type": "module",
   "exports": {
     ".": "./src/client.ts",