@proagentstore/cli 0.4.140 → 0.4.142

package/dist/browser-runner/coding/park-snapshot.js

@@ -72,6 +72,16 @@ export function parkSnapshot(workDir, runId) {
     git(workDir, ["update-ref", ref, snapshot]);
     return { snapshot, files: before.length, clean: changes(workDir).length === 0, ref };
 }
+/** The paths `git apply --check` names when it refuses — "patch failed: <path>:<line>", "<path>: does not match index", … */
+export function applyConflicts(stderr) {
+    const out = new Set();
+    for (const line of stderr.split("\n")) {
+        const m = line.match(/^error: patch failed: (.+):\d+$/) ?? line.match(/^error: (.+): (?:does not match index|already exists in working directory|does not exist in index|No such file or directory)$/);
+        if (m?.[1])
+            out.add(m[1]);
+    }
+    return [...out];
+}
 /** Put a parked run's work back by its exact id — only onto a clean tree, only if it applies cleanly. */
 export function parkRestore(workDir, runId, snapshot) {
     checkout(workDir, runId);
@@ -96,8 +106,9 @@ export function parkRestore(workDir, runId, snapshot) {
         try {
             git(workDir, ["apply", "--check"], patch);
         }
-        catch {
-            return { restored: false, refused: "the saved work no longer applies cleanly to this checkout (it changed underneath while the run was parked)" };
+        catch (e) {
+            const conflicts = applyConflicts(String(e.stderr ?? ""));
+            return { restored: false, refused: "the saved work no longer applies cleanly to this checkout (it changed underneath while the run was parked)", conflicts };
         }
     }
     // Untracked files: the stash's third parent. Any that already exists would be refused by git mid-apply.
@@ -110,7 +121,7 @@ export function parkRestore(workDir, runId, snapshot) {
     }
     const clash = untracked.filter((p) => existsSync(join(workDir, p)));
     if (clash.length)
-        return { restored: false, refused: `${clash.length} file${clash.length === 1 ? "" : "s"} the saved work would create already exist${clash.length === 1 ? "s" : ""} (first: ${clash[0]})` };
+        return { restored: false, refused: `${clash.length} file${clash.length === 1 ? "" : "s"} the saved work would create already exist${clash.length === 1 ? "s" : ""}`, conflicts: clash };
     git(workDir, ["stash", "apply", snapshot]);
     git(workDir, ["update-ref", "-d", ref, snapshot]);
     return { restored: true };

package/dist/browser-runner/local-apply/runtime.js

@@ -116,6 +116,18 @@ export function parseApplyEnvelope(raw) {
     if (Object.values(limits).some((v) => !v))
         throw bad("limits are out of range");
     const opt = (v) => (typeof v === "string" && v.trim() ? v.trim().slice(0, 300) : undefined);
+    // #1079: the owner's kept answers, within a resume's bounds — never an instruction. One over a bound is
+    // dropped, never cut: a shortened answer would be grounding the owner never wrote.
+    const ownerAnswers = [];
+    for (const a of Array.isArray(o.ownerAnswers) ? o.ownerAnswers : []) {
+        if (ownerAnswers.length >= LOCAL_APPLY_CAPS.answers)
+            break;
+        const r = (a && typeof a === "object" ? a : {});
+        const question = typeof r.question === "string" ? r.question.trim() : "";
+        const answer = typeof r.answer === "string" ? r.answer.trim() : "";
+        if (question && answer && question.length <= LOCAL_APPLY_CAPS.questionChars && answer.length <= LOCAL_APPLY_CAPS.answerChars)
+            ownerAnswers.push({ question, answer });
+    }
     return {
         type: LOCAL_APPLY_TASK_TYPE,
         runId: o.runId,
@@ -132,6 +144,7 @@ export function parseApplyEnvelope(raw) {
         artifacts,
         policy: { mode: p.mode, allowDomains, ...(p.mode === "auto_submit" && gateId ? { submitGate: { gateId } } : {}), ...(p.screenshots === false ? { screenshots: false } : {}) },
         limits,
+        ...(ownerAnswers.length ? { ownerAnswers } : {}),
     };
 }
 /**
@@ -371,6 +384,9 @@ export class LocalApplyRuntime {
                 throw new Blocked("artifact_changed", [`${v.error} Re-run tailoring for this application.`]);
             blocks.push({ label: a.kind, text: v.text });
         }
+        // #1079: answers the owner already gave this application, as a source — the same shape a resume's answers take.
+        if (e.ownerAnswers?.length)
+            blocks.push({ label: "owner answers", text: e.ownerAnswers.map((a) => `Q: ${a.question}\nA: ${a.answer}`).join("\n\n") });
         run.grounding = blocks.map((b) => b.text);
         const bridgeScript = this.deps.bridgeScript ?? fileURLToPath(new URL("../local-browser/bridge-stdio.js", import.meta.url));
         const spec = buildApplyEngineSpec(e, applyPrompt(e, blocks), { command: process.execPath, args: [bridgeScript], env: { [BRIDGE_ENV.url]: selfUrl, [BRIDGE_ENV.runId]: e.runId, [BRIDGE_ENV.token]: run.token } }, join(run.dir, "mcp.json"));

package/dist/browser-runner/local-browser/runtime.js

@@ -174,7 +174,9 @@ export class LocalBrowserRuntime {
             return { runId: same.envelope.runId, taskId: same.envelope.runId, status: same.state, existing: true };
         if (this.runs.has(envelope.runId))
             throw new RunnerInputError(`Run ${envelope.runId} already exists with another requestId`, 409);
-        const active = [...this.runs.values()].filter((r) => r.envelope.instanceId === envelope.instanceId && r.state !== "ended").length;
+        // A PAUSED run waits on a person and holds no slot (#1079) — the cloud counts the same way. Its own
+        // resume is the owner's act and is not refused, so the cap bounds STARTS; research is read-only.
+        const active = [...this.runs.values()].filter((r) => r.envelope.instanceId === envelope.instanceId && r.state === "running").length;
         if (active >= envelope.limits.maxConcurrent)
             throw new RunnerInputError(`This machine is already running ${active} research run(s) for this agent (limit ${envelope.limits.maxConcurrent}).`, 409);
         const selfUrl = this.deps.selfUrl();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@proagentstore/cli",
-  "version": "0.4.140",
+  "version": "0.4.142",
   "description": "CLI for creating, publishing, and running ProAgentStore agents",
   "license": "MIT",
   "type": "module",