pi-landstrip 0.19.1 → 0.19.2

package/dist/index.ts

@@ -2807,7 +2807,8 @@ function taskProgress(task) {
   return progress;
 }
 function workerDialogTitle(task, title) {
-  return `@${task.agent} · ${task.description} · ${task.id.slice(0, 8)}
+  const label = `@${task.agent} · ${task.description} · ${task.id.slice(0, 8)}`;
+  return title === undefined ? label : `${label}
 ${title}`;
 }
 function messageContentText(message) {
@@ -2880,7 +2881,7 @@ function modelEndpoint(ctx, selectedModel) {
   const active = selectedModel === activeName || byId.length === 0 && selectedModel === ctx.model?.id ? ctx.model : undefined;
   const model = registered ?? active;
   if (!model)
-    return { model: selectedModel, domains: [] };
+    return { error: byId.length > 1 ? "Ambiguous model" : "Model not found" };
   const domains = [];
   const endpoint = {
     provider: model.provider,
@@ -2897,20 +2898,21 @@ function modelEndpoint(ctx, selectedModel) {
     domains.push(refreshHost);
   return endpoint;
 }
-async function workerEndpoint(ctx, selectedModel, signal) {
+async function workerEndpoint(ctx, selectedModel, agentName, signal) {
   if (signal.aborted)
     throw new Error("Task cancelled");
   const endpoint = modelEndpoint(ctx, selectedModel);
+  if ("error" in endpoint) {
+    throw new Error(`${endpoint.error} for subagent ${agentName}: ${selectedModel}`);
+  }
   const { provider, domains, selected } = endpoint;
-  if (provider === undefined)
-    return endpoint;
   const auth = await resolveWorkerAuth(ctx.modelRegistry, provider, signal, selected);
   const host = workerAuthHost(auth?.auth.baseUrl);
   const granted = [...new Set(host ? [...domains, host] : domains)];
   return {
     ...endpoint,
     domains: granted,
-    resolveAuth: auth && selected ? workerAuthResolver(ctx.modelRegistry, selected, granted) : undefined
+    resolveAuth: auth ? workerAuthResolver(ctx.modelRegistry, selected, granted) : undefined
   };
 }
 function agentBootstrapPaths(agentDir, privateAuth) {
@@ -4880,7 +4882,7 @@ ${catalog.diagnostics.join(`
     const model = agent.model ?? (ctx.model ? `${ctx.model.provider}/${ctx.model.id}` : undefined);
     if (!model)
       throw new Error(`No model available for subagent ${agent.name}`);
-    const endpoint = await workerEndpoint(ctx, model, signal);
+    const endpoint = await workerEndpoint(ctx, model, agent.name, signal);
     if (signal.aborted)
       throw new Error("Task cancelled");
     const thinking = agent.variant && PI_THINKING_LEVELS.has(agent.variant) ? agent.variant : this.pi.getThinkingLevel();
@@ -4905,7 +4907,8 @@ ${catalog.diagnostics.join(`
       join7(packageDir, "index.ts"),
       ...workerExtensions.flatMap((extension) => ["--extension", extension.entry]),
       ...task.sessionFile ? ["--session", task.sessionFile] : task.sessionDir ? ["--session-dir", task.sessionDir] : [],
-      ...endpoint.provider === undefined ? [] : ["--provider", endpoint.provider],
+      "--provider",
+      endpoint.provider,
       "--model",
       endpoint.model,
       "--thinking",
@@ -4934,6 +4937,7 @@ ${catalog.diagnostics.join(`
       const modelsStorePath = join7(agentDir, "models-store.json");
       const cliEntry = invocation.args[0] ?? invocation.command;
       launch = await this.integration.prepareRpcWorker({
+        permissionPromptLabel: workerDialogTitle(task),
         command: invocation.command,
         args,
         cwd: ctx.cwd,
@@ -5867,9 +5871,32 @@ function extractNativeDeniedPath(output, cwd) {
     return normalizePathMatch(match[1], cwd);
   return null;
 }
+function extractDeniedPathMention(output, cwd, denied) {
+  const start = /(?<=^|['"`\s=:(])(?=\/|[a-zA-Z]:[\\/])/g;
+  for (const line of output.split(/\r?\n/)) {
+    for (const match of line.matchAll(start)) {
+      const raw = line.slice(match.index);
+      const quoted = raw.match(/^([^'"`]+)['"`]/);
+      const words = (quoted ? quoted[1] : raw).replace(/[.,:;)\]]+$/, "").split(" ");
+      for (let count = words.length;count > 0; count -= 1) {
+        const candidate = words.slice(0, count).join(" ");
+        if (!existsSync6(candidate))
+          continue;
+        const path = normalizeBlockedPath(candidate, cwd);
+        if (denied(path))
+          return path;
+        break;
+      }
+    }
+  }
+  return null;
+}
 function extractRetryableNativeReadDeniedPath(output, cwd, allowRead, denyRead) {
+  const denied = (path2) => !readAllowed(path2, allowRead, denyRead, cwd);
   const path = extractNativeDeniedPath(output, cwd);
-  return path && !readAllowed(path, allowRead, denyRead, cwd) ? path : null;
+  if (path)
+    return denied(path) ? path : null;
+  return extractDeniedPathMention(output, cwd, denied);
 }
 function extractNativeWriteDeniedPath(output, cwd) {
   const denial = String.raw`(?:Access is denied\.?|Operation not permitted|Permission denied)`;
@@ -5947,11 +5974,12 @@ async function stopPreparedChild(child) {
     settleTimer = setTimeout(done, 1000);
   });
 }
-async function showPermissionPrompt(ctx, title, options, signal) {
+async function showPermissionPrompt(ctx, title, options, signal, label) {
   if (!ctx.hasUI)
     return "abort";
   const labels = options.map((option2) => option2.hint ? `${option2.label} — ${option2.hint}` : option2.label);
-  const selected = await ctx.ui.select(title, labels, { signal });
+  const selected = await ctx.ui.select(label ? `${label}
+${title}` : title, labels, { signal });
   if (signal?.aborted)
     return "abort";
   const index = selected === undefined ? -1 : labels.indexOf(selected);
@@ -5959,7 +5987,8 @@ async function showPermissionPrompt(ctx, title, options, signal) {
   if (!option)
     return "abort";
   if (option.confirm) {
-    const confirmed = await ctx.ui.confirm("Save this permission?", `${title}
+    const confirmed = await ctx.ui.confirm(label ? `${label}
+Save this permission?` : "Save this permission?", `${title}
 
 ${option.hint ?? "This changes persisted sandbox policy."}`, { signal });
     if (!confirmed || signal?.aborted)
@@ -5967,9 +5996,9 @@ ${option.hint ?? "This changes persisted sandbox policy."}`, { signal });
   }
   return option.action;
 }
-function promptReadBlock(ctx, filePath, reason, signal) {
+function promptReadBlock(ctx, filePath, reason, signal, label) {
   const title = reason ? `Read blocked: "${filePath}" is in denyRead (${reason})` : `Read blocked: "${filePath}" is not in allowRead`;
-  return showPermissionPrompt(ctx, title, PERMISSION_OPTIONS, signal);
+  return showPermissionPrompt(ctx, title, PERMISSION_OPTIONS, signal, label);
 }
 function writeEnvFile(env, proxyPort, proxyToken) {
   const lines = [];
@@ -6348,7 +6377,7 @@ ${paths}${note}`, PERMISSION_OPTIONS, promptSignal);
     if (!ctx.hasUI)
       return current() ?? false;
     return permissionPrompts.resolve(current, async (promptSignal) => {
-      const choice = await showPermissionPrompt(ctx, `Network blocked: "${domain}" is not in the allowed domains list`, PERMISSION_OPTIONS, promptSignal);
+      const choice = await showPermissionPrompt(ctx, `Network blocked: "${domain}" is not in the allowed domains list`, PERMISSION_OPTIONS, promptSignal, allowances?.permissionPromptLabel);
       if (choice === "abort" || promptSignal.aborted)
         return false;
       await applyDomainChoice(choice, domain, cwd, allowances);
@@ -6428,7 +6457,7 @@ ${paths}${note}`, PERMISSION_OPTIONS, promptSignal);
       if (!ctx.hasUI || !promptOnBlock)
         return { action: "deny", reason: "unprompted" };
       return permissionPrompts.resolve(current2, async (promptSignal) => {
-        const choice = await showPermissionPrompt(ctx, `Network blocked: ${trap.operation} "${trap.target}"`, NETWORK_PERMISSION_OPTIONS, promptSignal);
+        const choice = await showPermissionPrompt(ctx, `Network blocked: ${trap.operation} "${trap.target}"`, NETWORK_PERMISSION_OPTIONS, promptSignal, allowances.permissionPromptLabel);
         if (choice === "abort" || promptSignal.aborted)
           return { action: "deny", reason: "rejected" };
         const targets = choice === "once" ? allowances.targets : sessionAllowedTargets;
@@ -6462,7 +6491,7 @@ ${paths}${note}`, PERMISSION_OPTIONS, promptSignal);
       return { action: "deny", reason: "unprompted" };
     return permissionPrompts.resolve(current, async (promptSignal) => {
       const config = loadConfig(cwd);
-      const choice = trap.operation === "read" ? await promptReadBlock(ctx, path, matchesPattern(path, config.filesystem.denyRead, cwd) ? "granting allowRead will override it" : undefined, promptSignal) : await showPermissionPrompt(ctx, `Write blocked: "${path}" is not in allowWrite`, PERMISSION_OPTIONS, promptSignal);
+      const choice = trap.operation === "read" ? await promptReadBlock(ctx, path, matchesPattern(path, config.filesystem.denyRead, cwd) ? "granting allowRead will override it" : undefined, promptSignal, allowances.permissionPromptLabel) : await showPermissionPrompt(ctx, `Write blocked: "${path}" is not in allowWrite`, PERMISSION_OPTIONS, promptSignal, allowances.permissionPromptLabel);
       if (choice === "abort" || promptSignal.aborted)
         return { action: "deny", reason: "rejected" };
       if (trap.operation === "read") {
@@ -6569,6 +6598,7 @@ ${paths}${note}`, PERMISSION_OPTIONS, promptSignal);
       return prepareUnsandboxedRpcWorker(options2);
     }
     const allowances = {
+      permissionPromptLabel: options2.permissionPromptLabel,
       domains: [...options2.domains ?? []],
       readPaths: [...options2.readPaths],
       writePaths: [...options2.writePaths],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pi-landstrip",
-  "version": "0.19.1",
+  "version": "0.19.2",
   "description": "Sandboxed Bash and process-backed agents for Pi",
   "keywords": [
     "landstrip",
@@ -39,7 +39,7 @@
     "ci:test": "npm run test"
   },
   "dependencies": {
-    "@landstrip/landstrip-api": "^0.19.1",
+    "@landstrip/landstrip-api": "^0.19.2",
     "jsonc-parser": "^3.3.1",
     "minimatch": "^10.2.5",
     "undici": "^8.9.0",