@abelxiaoxing/cadence 2.0.2 → 2.0.3

package/src/service/private-files.ts

@@ -26,10 +26,14 @@ export function refused(): never {
 export function hash(bytes: string | Buffer): string {
   return createHash("sha256").update(bytes).digest("hex");
 }
-function privateMode(st: Stats): void {
+/** Owner-only mode for state Cadence creates. External sources it only reads
+ * (Pi's agent directory and files) keep whatever mode the user's umask gave
+ * them, such as 0755/0775 from Pi itself; ownership is still required. */
+function privateMode(st: Stats, ownerOnly = true): void {
   if (
     process.platform !== "win32" &&
-    ((st.mode & 0o077) !== 0 || (process.getuid && st.uid !== process.getuid()))
+    ((ownerOnly && (st.mode & 0o077) !== 0) ||
+      (process.getuid && st.uid !== process.getuid()))
   )
     refused();
 }
@@ -80,7 +84,7 @@ export class DirectoryWalks {
   remember(path: string, st: Stats): void {
     if (this.open()) this.walked.set(path, { dev: st.dev, ino: st.ino });
   }
-  reuse(path: string): boolean {
+  reuse(path: string, ownerOnly = true): boolean {
     const walked = this.open() ? this.walked.get(path) : undefined;
     if (!walked) return false;
     let st: Stats;
@@ -100,7 +104,7 @@ export class DirectoryWalks {
       this.walked.delete(path);
       return false;
     }
-    privateMode(st);
+    privateMode(st, ownerOnly);
     return true;
   }
 }
@@ -109,14 +113,18 @@ export class DirectoryWalks {
  * or hostile-same-user guarantee; failed temporaries are deliberately preserved.
  */
 export class PrivateFiles {
-  constructor(readonly namespace: string) {}
+  /** `ownerOnly: false` for an external namespace such as Pi's agent directory. */
+  constructor(
+    readonly namespace: string,
+    readonly ownerOnly = true,
+  ) {}
   directory(path: string, create = false, walks?: DirectoryWalks): boolean {
     const tail = relative(this.namespace, path);
     if (isAbsolute(tail) || tail === ".." || tail.startsWith(`..${sep}`))
       refused();
     if (!create) {
       const full = resolve(path);
-      if (walks?.reuse(full)) return true;
+      if (walks?.reuse(full, this.ownerOnly)) return true;
       const namespace = resolve(this.namespace);
       let inside = false,
         last: Stats | undefined;
@@ -126,7 +134,7 @@ export class PrivateFiles {
         // including an unsafe parent before a missing child. Only the caller's
         // DirectoryWalks keeps the result, for that same synchronous operation.
         if (at === namespace) inside = true;
-        if (inside) privateMode(st);
+        if (inside) privateMode(st, this.ownerOnly);
         last = st;
       });
       if (found && last) walks?.remember(full, last);
@@ -135,7 +143,7 @@ export class PrivateFiles {
     // Walk the namespace and its ambient ancestors once, then check each
     // private segment exactly once, creating a missing one privately.
     if (!safeDirectory(this.namespace, true)) return false;
-    privateMode(lstatSync(this.namespace));
+    privateMode(lstatSync(this.namespace), this.ownerOnly);
     let at = this.namespace;
     for (const part of tail.split(sep).filter(Boolean)) {
       at = join(at, part);
@@ -160,7 +168,7 @@ export class PrivateFiles {
       }
       if (!st.isDirectory() || st.isSymbolicLink())
         throw new Error("Unsafe directory");
-      privateMode(st);
+      privateMode(st, this.ownerOnly);
     }
     return true;
   }
@@ -179,7 +187,7 @@ export class PrivateFiles {
     }
     if (!before.isFile() || before.nlink !== 1 || before.size > maximum)
       refused();
-    privateMode(before);
+    privateMode(before, this.ownerOnly);
     const fd = openSync(path, constants.O_RDONLY | (constants.O_NOFOLLOW ?? 0));
     try {
       const opened = fstatSync(fd);

package/src/service-cli.mjs

@@ -2510,6 +2510,23 @@ function hostSystem(root) {
         "--value"
       ]);
       return r.status === 0 ? r.stdout.trim() === "yes" : undefined;
+    },
+    enableLinger: (interactive) => {
+      const r = interactive ? spawnSync2("loginctl", ["enable-linger"], { stdio: "inherit" }) : spawnSync2("busctl", [
+        "--system",
+        "--allow-interactive-authorization=no",
+        "--timeout=15",
+        "call",
+        "org.freedesktop.login1",
+        "/org/freedesktop/login1",
+        "org.freedesktop.login1.Manager",
+        "SetUserLinger",
+        "ubb",
+        String(process.getuid?.()),
+        "true",
+        "false"
+      ], { stdio: "ignore", timeout: 20000 });
+      return !r.error && r.status === 0;
     }
   };
 }
@@ -2672,7 +2689,17 @@ function regularFile(path) {
     return false;
   }
 }
-function configureAutostart(s, mode, requested) {
+function bootStart(s, attempt, interactive) {
+  const current = s.linger();
+  if (current === undefined)
+    return {};
+  if (current)
+    return { linger: "on" };
+  if (!attempt)
+    return { linger: "off" };
+  return { linger: s.enableLinger(interactive) ? "enabled" : "refused" };
+}
+function configureAutostart(s, mode, requested, linger = false) {
   if (s.platform !== "linux")
     return { status: "skipped" };
   if (mode === "refresh" && (s.env.CADENCE_AUTOSTART === "0" || !piUserInstall(s)))
@@ -2714,11 +2741,12 @@ function configureAutostart(s, mode, requested) {
     return { status: "failed", ...result };
   if (!wanted && !active)
     return { status: "disabled", ...result };
+  const boot = () => wanted ? bootStart(s, mode === "install" ? linger : previous === undefined && s.env.CADENCE_LINGER !== "0", mode === "install") : {};
   if (!regularFile(join2(agentDir, "auth.json")))
-    return { status: "waiting-for-pi-login", ...result };
+    return { status: "waiting-for-pi-login", ...result, ...boot() };
   s.systemctl(["reset-failed", s.unit]);
   const started = s.systemctl(["start", s.unit]).status === 0;
-  return { status: started ? "started" : "failed", ...result };
+  return { status: started ? "started" : "failed", ...result, ...boot() };
 }
 function removeAutostart(s) {
   if (s.platform !== "linux")
@@ -2751,7 +2779,8 @@ function autostartStatus(s) {
     status: s.systemctl(["is-active", s.unit]).stdout.trim() || "unknown",
     enabled: s.systemctl(["is-enabled", s.unit]).stdout.trim() || "unknown",
     unit: path,
-    workspace: generatedWorkspace(previous)
+    workspace: generatedWorkspace(previous),
+    ...bootStart(s, false, false)
   };
 }
 
@@ -2786,8 +2815,8 @@ function refused() {
 function hash(bytes) {
   return createHash2("sha256").update(bytes).digest("hex");
 }
-function privateMode(st) {
-  if (process.platform !== "win32" && ((st.mode & 63) !== 0 || process.getuid && st.uid !== process.getuid()))
+function privateMode(st, ownerOnly = true) {
+  if (process.platform !== "win32" && (ownerOnly && (st.mode & 63) !== 0 || process.getuid && st.uid !== process.getuid()))
     refused();
 }
 function same(a, b) {
@@ -2822,7 +2851,7 @@ class DirectoryWalks {
     if (this.open())
       this.walked.set(path, { dev: st.dev, ino: st.ino });
   }
-  reuse(path) {
+  reuse(path, ownerOnly = true) {
     const walked = this.open() ? this.walked.get(path) : undefined;
     if (!walked)
       return false;
@@ -2839,15 +2868,17 @@ class DirectoryWalks {
       this.walked.delete(path);
       return false;
     }
-    privateMode(st);
+    privateMode(st, ownerOnly);
     return true;
   }
 }
 
 class PrivateFiles {
   namespace;
-  constructor(namespace) {
+  ownerOnly;
+  constructor(namespace, ownerOnly = true) {
     this.namespace = namespace;
+    this.ownerOnly = ownerOnly;
   }
   directory(path, create = false, walks) {
     const tail = relative2(this.namespace, path);
@@ -2855,7 +2886,7 @@ class PrivateFiles {
       refused();
     if (!create) {
       const full = resolve3(path);
-      if (walks?.reuse(full))
+      if (walks?.reuse(full, this.ownerOnly))
         return true;
       const namespace = resolve3(this.namespace);
       let inside = false, last;
@@ -2863,7 +2894,7 @@ class PrivateFiles {
         if (at2 === namespace)
           inside = true;
         if (inside)
-          privateMode(st);
+          privateMode(st, this.ownerOnly);
         last = st;
       });
       if (found && last)
@@ -2872,7 +2903,7 @@ class PrivateFiles {
     }
     if (!safeDirectory(this.namespace, true))
       return false;
-    privateMode(lstatSync3(this.namespace));
+    privateMode(lstatSync3(this.namespace), this.ownerOnly);
     let at = this.namespace;
     for (const part of tail.split(sep3).filter(Boolean)) {
       at = join3(at, part);
@@ -2892,7 +2923,7 @@ class PrivateFiles {
       }
       if (!st.isDirectory() || st.isSymbolicLink())
         throw new Error("Unsafe directory");
-      privateMode(st);
+      privateMode(st, this.ownerOnly);
     }
     return true;
   }
@@ -2909,7 +2940,7 @@ class PrivateFiles {
     }
     if (!before.isFile() || before.nlink !== 1 || before.size > maximum)
       refused();
-    privateMode(before);
+    privateMode(before, this.ownerOnly);
     const fd = openSync2(path, constants2.O_RDONLY | (constants2.O_NOFOLLOW ?? 0));
     try {
       const opened = fstatSync2(fd);
@@ -5843,13 +5874,13 @@ function startupGuidance(result, input) {
       return `Cadence refused its installed package files (web/dist or agents); reinstall the package rather than editing it.
 `;
     case "pi-agent-directory":
-      return `Pi's agent directory ${agent} must be an existing real directory owned by you with mode 0700 (chmod 700).
+      return `Pi's agent directory ${agent} must be an existing real directory (not a symlink) owned by you.
 `;
     case "pi-auth":
-      return `${join8(agent, "auth.json")} must be your own single-link regular file with mode 0600 holding valid Pi credentials; log in to Pi first.
+      return `${join8(agent, "auth.json")} must be your own single-link regular file holding valid Pi credentials; log in to Pi first.
 `;
     case "pi-models":
-      return `${join8(agent, "models.json")} must be your own single-link regular file with mode 0600, using only fields Cadence's pinned Pi SDK supports; a field only newer Pi understands is refused.
+      return `${join8(agent, "models.json")} must be your own single-link regular file using only fields Cadence's pinned Pi SDK supports; a field only newer Pi understands is refused.
 `;
     case "pi-runtime":
       return `Loading Pi's SDK model runtime failed after the owner registered (optional SDK packages missing, or sources the SDK refuses); it stays quarantined.
@@ -5984,15 +6015,30 @@ function autostartGuidance(s, result) {
 ` : "";
   return note + autostartStatusGuidance(s, result, name, cli, workspace, manage);
 }
+function lingerGuidance(linger) {
+  switch (linger) {
+    case "enabled":
+      return `Linger enabled: Cadence starts at boot and keeps running after logout (undo: loginctl disable-linger).
+`;
+    case "off":
+      return `Linger is off: Cadence starts at login and stops at logout. Start it at boot: loginctl enable-linger
+`;
+    case "refused":
+      return `Linger needs authorization: Cadence starts at login and stops at logout. Start it at boot: loginctl enable-linger (may ask for your password)
+`;
+    default:
+      return "";
+  }
+}
 function autostartStatusGuidance(s, result, name, cli, workspace, manage) {
   switch (result.status) {
     case "started": {
+      const linger = lingerGuidance(result.linger);
       if (result.service !== "alive")
         return `${s.unit} started for ${result.workspace}, but the owner reports ${result.service}.
 Inspect: node ${cli} diagnose --workspace ${workspace}
 ${manage}
-`;
-      const linger = s.linger() === false ? "Linger is off: Cadence starts at login and stops at logout. `loginctl enable-linger` keeps it running and starts it at boot.\n" : "";
+${linger}`;
       return `Cadence WebUI: ${result.endpoint} (${s.unit}, workspace ${result.workspace})
 Enter with your private link: node ${cli} token-link --workspace ${workspace} --reveal
 ${manage}
@@ -6001,7 +6047,7 @@ ${linger}`;
     case "waiting-for-pi-login":
       return `${s.unit} is enabled for ${result.workspace}; it starts once Pi has ${join8(agentDirectory(s), "auth.json")}.
 Log in to Pi, then: systemctl --user start ${name}
-`;
+${lingerGuidance(result.linger)}`;
     case "disabled":
       return `${s.unit} refreshed for ${result.workspace}; left disabled as configured.
 `;
@@ -6019,7 +6065,7 @@ Log in to Pi, then: systemctl --user start ${name}
 `;
     case "failed":
       return `Could not enable or start ${s.unit}; see systemctl --user status ${name} and journalctl --user -u ${name}.
-`;
+${lingerGuidance(result.linger)}`;
     default:
       return "";
   }
@@ -6027,8 +6073,16 @@ Log in to Pi, then: systemctl --user start ${name}
 async function autostartMain(argv, hostUrl) {
   const action = argv.shift();
   let requested;
-  if (action === "install" && argv[0] === "--workspace" && argv[1])
-    requested = resolve5(argv.splice(0, 2)[1]);
+  let linger = false;
+  while (action === "install" && argv.length) {
+    if (argv[0] === "--workspace" && argv[1] && requested === undefined)
+      requested = resolve5(argv.splice(0, 2)[1]);
+    else if (argv[0] === "--linger" && !linger) {
+      argv.shift();
+      linger = true;
+    } else
+      break;
+  }
   if (argv.length || !["install", "refresh", "remove", "status"].includes(action ?? ""))
     throw new ContractError("invalid");
   const s = hostSystem(dirname8(dirname8(fileURLToPath(hostUrl))));
@@ -6039,7 +6093,7 @@ async function autostartMain(argv, hostUrl) {
     result = autostartStatus(s);
   else {
     try {
-      result = configureAutostart(s, action === "install" ? "install" : "refresh", requested);
+      result = configureAutostart(s, action === "install" ? "install" : "refresh", requested, linger);
     } catch (error) {
       if (error instanceof ContractError && error.code === "invalid")
         process.stderr.write(`Cadence autostart needs an existing absolute workspace directory (--workspace or CADENCE_WORKSPACE).
@@ -6062,8 +6116,8 @@ async function managementMain(argv, hostUrl) {
     const command = argv.shift();
     if (command === "--help" && !argv.length) {
       process.stdout.write(`cadence-service start|status|diagnose|stop|token-link --reveal|token-rotate|recover inspect|recover resolve [--workspace PATH] [--state-home PATH]
-cadence-service autostart install [--workspace PATH]|refresh|remove|status
-Start is explicit, or the Linux systemd user unit that Pi's user-scope install registers (CADENCE_AUTOSTART=0, disable or mask opts out). Default detached or --foreground. Start accepts --config, --agent-dir, --host, --port, --token-file.
+cadence-service autostart install [--workspace PATH] [--linger]|refresh|remove|status
+Start is explicit, or the Linux systemd user unit that Pi's user-scope install registers (CADENCE_AUTOSTART=0, disable or mask opts out); its first registration also enables linger for boot start when logind allows it without a password (CADENCE_LINGER=0 opts out), and --linger asks for it explicitly. Default detached or --foreground. Start accepts --config, --agent-dir, --host, --port, --token-file.
 Return/quit detaches clients; only explicit Cancel/Stop requests stop. Unconfirmed/quarantined is not stopped.
 Recovery resolve requires this local native terminal, exact unchanged dead-owner resources and separate process/credential/storage acknowledgments. No --yes, network recovery, killing, repair or cleanup.
 `);

package/src/service-host.mjs

@@ -2134,8 +2134,8 @@ function refused() {
 function hash(bytes) {
   return createHash3("sha256").update(bytes).digest("hex");
 }
-function privateMode(st) {
-  if (process.platform !== "win32" && ((st.mode & 63) !== 0 || process.getuid && st.uid !== process.getuid()))
+function privateMode(st, ownerOnly = true) {
+  if (process.platform !== "win32" && (ownerOnly && (st.mode & 63) !== 0 || process.getuid && st.uid !== process.getuid()))
     refused();
 }
 function same(a, b) {
@@ -2170,7 +2170,7 @@ class DirectoryWalks {
     if (this.open())
       this.walked.set(path, { dev: st.dev, ino: st.ino });
   }
-  reuse(path) {
+  reuse(path, ownerOnly = true) {
     const walked = this.open() ? this.walked.get(path) : undefined;
     if (!walked)
       return false;
@@ -2187,15 +2187,17 @@ class DirectoryWalks {
       this.walked.delete(path);
       return false;
     }
-    privateMode(st);
+    privateMode(st, ownerOnly);
     return true;
   }
 }
 
 class PrivateFiles {
   namespace;
-  constructor(namespace) {
+  ownerOnly;
+  constructor(namespace, ownerOnly = true) {
     this.namespace = namespace;
+    this.ownerOnly = ownerOnly;
   }
   directory(path, create = false, walks) {
     const tail = relative2(this.namespace, path);
@@ -2203,7 +2205,7 @@ class PrivateFiles {
       refused();
     if (!create) {
       const full = resolve2(path);
-      if (walks?.reuse(full))
+      if (walks?.reuse(full, this.ownerOnly))
         return true;
       const namespace = resolve2(this.namespace);
       let inside = false, last;
@@ -2211,7 +2213,7 @@ class PrivateFiles {
         if (at2 === namespace)
           inside = true;
         if (inside)
-          privateMode(st);
+          privateMode(st, this.ownerOnly);
         last = st;
       });
       if (found && last)
@@ -2220,7 +2222,7 @@ class PrivateFiles {
     }
     if (!safeDirectory(this.namespace, true))
       return false;
-    privateMode(lstatSync2(this.namespace));
+    privateMode(lstatSync2(this.namespace), this.ownerOnly);
     let at = this.namespace;
     for (const part of tail.split(sep2).filter(Boolean)) {
       at = join2(at, part);
@@ -2240,7 +2242,7 @@ class PrivateFiles {
       }
       if (!st.isDirectory() || st.isSymbolicLink())
         throw new Error("Unsafe directory");
-      privateMode(st);
+      privateMode(st, this.ownerOnly);
     }
     return true;
   }
@@ -2257,7 +2259,7 @@ class PrivateFiles {
     }
     if (!before.isFile() || before.nlink !== 1 || before.size > maximum)
       refused();
-    privateMode(before);
+    privateMode(before, this.ownerOnly);
     const fd = openSync2(path, constants2.O_RDONLY | (constants2.O_NOFOLLOW ?? 0));
     try {
       const opened = fstatSync2(fd);
@@ -17108,7 +17110,7 @@ function piSource(agentDir, home, cwd, env) {
   const directory = join12(realpathSync4(dirname9(selected2)), selected2.slice(dirname9(selected2).length + 1));
   if (!lstatSync8(directory).isDirectory() || lstatSync8(directory).isSymbolicLink())
     refuse2();
-  const files = new PrivateFiles(directory);
+  const files = new PrivateFiles(directory, false);
   if (!files.directory(directory))
     refuse2();
   return {

package/src/task-shell.ts

@@ -11,6 +11,7 @@ import {
 } from "@earendil-works/pi-tui";
 import {
   autostartHint,
+  departure,
   MANAGEMENT_GUIDANCE,
   NativeConnection,
 } from "./native-client.ts";
@@ -98,10 +99,10 @@ export function registerTaskShell(pi: ExtensionAPI): void {
     dismiss?.();
     // Detach original attachment, not service jobs/provider/auth. Shutdown does
     // not wait for their lifetime. Retained transport blocks uncertain reuse.
-    void connection.detach().catch(() => {});
+    return connection.detach().catch(() => {});
   };
   pi.on("session_start", (_event, ctx) => {
-    depart();
+    void depart();
     unsubscribe?.();
     unsubscribe = undefined;
     selectedTask = undefined;
@@ -112,15 +113,17 @@ export function registerTaskShell(pi: ExtensionAPI): void {
       });
   });
   pi.on("session_shutdown", () => {
-    depart();
+    const leaving = depart();
     unsubscribe?.();
     unsubscribe = undefined;
+    return departure(leaving);
   });
-  pi.on("session_before_switch", depart);
-  pi.on("session_before_fork", depart);
-  pi.on("session_before_tree", depart);
-  pi.on("session_before_compact", depart);
-  pi.on("model_select", depart);
+  const leave = () => void depart();
+  pi.on("session_before_switch", leave);
+  pi.on("session_before_fork", leave);
+  pi.on("session_before_tree", leave);
+  pi.on("session_before_compact", leave);
+  pi.on("model_select", leave);
   // Only local dialog input is owned. Detached service work never owns Pi's
   // conversation/tool lifetime or silently cancels it.
   pi.on("input", () => (modal ? { action: "handled" as const } : undefined));