@corenel/sidecar 0.6.1 → 0.6.2

package/dist/cli.js

@@ -14040,7 +14040,7 @@ var require_express_app = __commonJS({
           this.name += this.ext = (this.defaultEngine[0] !== "." ? "." : "") + this.defaultEngine;
         }
       }
-      NunjucksView.prototype.render = function render(opts, cb) {
+      NunjucksView.prototype.render = function render2(opts, cb) {
         env.render(this.name, opts, cb);
       };
       app.set("view", NunjucksView);
@@ -14313,7 +14313,7 @@ var require_environment = __commonJS({
       _proto.express = function express(app) {
         return expressApp(this, app);
       };
-      _proto.render = function render(name, ctx, cb) {
+      _proto.render = function render2(name, ctx, cb) {
         if (lib.isFunction(ctx)) {
           cb = ctx;
           ctx = null;
@@ -14441,7 +14441,7 @@ var require_environment = __commonJS({
           this.compiled = false;
         }
       };
-      _proto3.render = function render(ctx, parentFrame, cb) {
+      _proto3.render = function render2(ctx, parentFrame, cb) {
         var _this6 = this;
         if (typeof ctx === "function") {
           cb = ctx;
@@ -15021,7 +15021,7 @@ var require_nunjucks = __commonJS({
         }
         return new Template(src2, env, path, eagerCompile);
       },
-      render: function render(name, ctx, cb) {
+      render: function render2(name, ctx, cb) {
         if (!e2) {
           configure();
         }
@@ -23279,6 +23279,11 @@ function helpText() {
     "  roots list|add|remove [path]",
     "                    edit the working directories in daemon.json (add stores the",
     "                    resolved, absolute path)",
+    "  add-under list|add|remove [path]",
+    "                    edit the areas a client may add a root under, same way",
+    "  config list|get|set|unset|add|remove [key] [value]",
+    "                    read or change any daemon.json setting, including turning",
+    "                    a capability back off (config set allow-shell false)",
     "  doctor            report what this machine would serve, and what is wrong",
     "                    (exits non-zero on a definite fault -- safe to script)",
     "  login|logout|auth manage the signed-in account",
@@ -28845,7 +28850,7 @@ function makeMicrovmBackend(deps) {
       if (!live.length) return;
       const r2 = await deps.run(listArgs());
       if (r2.code !== 0) return;
-      const present2 = new Set(parseSandboxList(r2.stdout).map((row) => row.name));
+      const present2 = new Set(parseSandboxList(r2.stdout).map((row2) => row2.name));
       for (const s2 of live) {
         if (present2.has(sandboxName(s2.id))) continue;
         if (at2 - s2.createdAt < RECONCILE_MS) continue;
@@ -29130,21 +29135,21 @@ function makeMicrovmBackend(deps) {
         deps.log?.(`sessions: could not list existing sandboxes (msb exit ${r2.code}) \u2014 nothing adopted`);
         return { adopted, unmanaged };
       }
-      for (const row of parseSandboxList(r2.stdout)) {
-        const id = idFromSandboxName(row.name);
+      for (const row2 of parseSandboxList(r2.stdout)) {
+        const id = idFromSandboxName(row2.name);
         if (!id) continue;
         seq2 = Math.max(seq2, seqOf(id));
         if (sessions.has(id)) continue;
-        const inspected = await deps.run(inspectArgs(row.name)).catch(() => null);
+        const inspected = await deps.run(inspectArgs(row2.name)).catch(() => null);
         const labels = inspected && inspected.code === 0 ? parseSandboxLabels(inspected.stdout) : {};
         const workdir = labels[LABEL_WORKDIR];
         if (!workdir) {
-          unmanaged.push(row.name);
+          unmanaged.push(row2.name);
           continue;
         }
         if (!within(workdir)) {
-          deps.log?.(`sessions: sandbox "${row.name}" holds ${workdir}, outside this daemon's roots \u2014 not adopted`);
-          unmanaged.push(row.name);
+          deps.log?.(`sessions: sandbox "${row2.name}" holds ${workdir}, outside this daemon's roots \u2014 not adopted`);
+          unmanaged.push(row2.name);
           continue;
         }
         const stamped = Number(labels[LABEL_CREATED]);
@@ -29154,9 +29159,9 @@ function makeMicrovmBackend(deps) {
         const repoRef = labels[LABEL_REPO_REF];
         sessions.set(id, {
           id,
-          status: statusFromSandbox(row.status),
+          status: statusFromSandbox(row2.status),
           workdir,
-          createdAt: Number.isFinite(stamped) && stamped > 0 ? stamped : row.createdAt ?? now2(),
+          createdAt: Number.isFinite(stamped) && stamped > 0 ? stamped : row2.createdAt ?? now2(),
           ...owner ? { owner } : {},
           ...repoUrl && repoCommit ? { source: { url: repoUrl, commit: repoCommit, ...repoRef ? { ref: repoRef } : {} } } : {},
           /* THE ONLY PLACE THIS IS EVER SET TRUE. `create()` never touches it,
@@ -45398,6 +45403,7 @@ async function resolveEndpoint(args, env = process.env) {
 import { readFile as readFile2, writeFile, mkdir as mkdir3 } from "node:fs/promises";
 import { dirname as dirname7, join as join18 } from "node:path";
 var DAEMON_CONFIG_VERSION = 1;
+var SECRET_KEYS = ["acpAuth", "tunnelToken", "token"];
 var KNOWN_KEYS = [
   "version",
   "port",
@@ -45576,59 +45582,285 @@ async function runSetup(argv, io) {
   return 0;
 }
 
-// src/config/roots.ts
+// src/config/pathList.ts
 import { resolve as resolve10 } from "node:path";
-async function runRoots(argv, io) {
+function stripStateDir(argv) {
+  const at2 = argv.indexOf("--state-dir");
+  if (at2 < 0) return argv;
+  return [...argv.slice(0, at2), ...argv.slice(at2 + (argv[at2 + 1] === void 0 ? 1 : 2))];
+}
+async function runPathList(raw, io, spec) {
+  const argv = stripStateDir(raw);
   const sub = argv[0];
   const { config, unknown, corrupt } = await readDaemonConfig(io.stateDir);
-  const roots = Array.isArray(config.roots) ? config.roots : [];
+  const stored = config[spec.key];
+  const list = Array.isArray(stored) ? stored : [];
   if (corrupt && (sub === "add" || sub === "remove")) {
     io.err(`daemon.json in ${io.stateDir} is not valid JSON; fix or delete it before writing.`);
     return 2;
   }
   if (sub === "list") {
-    if (roots.length === 0) {
-      io.out("No working directories are configured. Add one with: corenel roots add <path>");
+    if (list.length === 0) {
+      io.out(spec.empty);
       return 0;
     }
-    for (const r2 of roots) io.out(r2);
+    for (const p2 of list) io.out(p2);
     return 0;
   }
   if (sub === "add") {
     const path = argv[1];
     if (!path) {
-      io.err("corenel roots add needs a path.");
+      io.err(`${spec.command} add needs a path.`);
       return 2;
     }
     const full = resolve10(path);
-    if (roots.some((r2) => resolve10(r2) === full)) {
-      io.out(`${full} is already a configured working directory.`);
+    if (list.some((p2) => resolve10(p2) === full)) {
+      io.out(`${full} is already a configured ${spec.noun}.`);
       return 0;
     }
-    await writeDaemonConfig(io.stateDir, { ...config, roots: [...roots, full] }, unknown);
+    await writeDaemonConfig(io.stateDir, { ...config, [spec.key]: [...list, full] }, unknown);
     io.out(`Added ${full} to daemon.json. A running daemon picks this up on restart.`);
     return 0;
   }
   if (sub === "remove") {
     const path = argv[1];
     if (!path) {
-      io.err("corenel roots remove needs a path.");
+      io.err(`${spec.command} remove needs a path.`);
       return 2;
     }
     const full = resolve10(path);
-    if (!roots.some((r2) => resolve10(r2) === full)) {
-      io.err(`${full} is not a configured working directory.`);
+    if (!list.some((p2) => resolve10(p2) === full)) {
+      io.err(`${full} is not a configured ${spec.noun}.`);
       return 2;
     }
     await writeDaemonConfig(
       io.stateDir,
-      { ...config, roots: roots.filter((r2) => resolve10(r2) !== full) },
+      { ...config, [spec.key]: list.filter((p2) => resolve10(p2) !== full) },
       unknown
     );
     io.out(`Removed ${full} from daemon.json. A running daemon keeps it until restart.`);
     return 0;
   }
-  io.err(`Unknown subcommand "${sub ?? ""}". Use: corenel roots list | add <path> | remove <path>`);
+  io.err(`Unknown subcommand "${sub ?? ""}". Use: ${spec.command} list | add <path> | remove <path>`);
+  return 2;
+}
+
+// src/config/roots.ts
+function runRoots(argv, io) {
+  return runPathList(argv, io, {
+    key: "roots",
+    command: "corenel roots",
+    noun: "working directory",
+    empty: "No working directories are configured. Add one with: corenel roots add <path>"
+  });
+}
+
+// src/config/addUnder.ts
+function runAddUnder(argv, io) {
+  return runPathList(argv, io, {
+    key: "addUnder",
+    command: "corenel add-under",
+    noun: "area a client may add a root under",
+    empty: "No areas are configured. Clients cannot add roots. Add one with: corenel add-under add <path>"
+  });
+}
+
+// src/config/keyTypes.ts
+var KEY_TYPES = {
+  port: "number",
+  host: "string",
+  roots: "string[]",
+  addUnder: "string[]",
+  cloneUnder: "string[]",
+  allowLan: "boolean",
+  allowOrigins: "string[]",
+  tlsCert: "string",
+  tlsKey: "string",
+  selfSigned: "boolean",
+  tunnel: "string",
+  tunnelName: "string",
+  tunnelHostname: "string",
+  endpoint: "string",
+  allowShell: "boolean",
+  keepTranscripts: "boolean",
+  isolation: "string",
+  msbBin: "string",
+  guestImage: "string",
+  maxChainDepth: "number",
+  name: "string",
+  appUrl: "string",
+  defaultModel: "string"
+};
+var kebab = (k2) => k2.replace(/[A-Z]/g, (c2) => `-${c2.toLowerCase()}`);
+function resolveKeyName(input) {
+  if (Object.prototype.hasOwnProperty.call(KEY_TYPES, input)) return input;
+  for (const k2 of Object.keys(KEY_TYPES)) if (kebab(k2) === input) return k2;
+  return null;
+}
+function isListKey(key) {
+  return KEY_TYPES[key] === "string[]";
+}
+function coerceValue(key, raw) {
+  const type = KEY_TYPES[key];
+  if (!type) return { ok: false, reason: `"${key}" is not a daemon.json setting.` };
+  if (type === "boolean") {
+    if (raw === "true") return { ok: true, value: true };
+    if (raw === "false") return { ok: true, value: false };
+    return { ok: false, reason: `${key} must be true or false, not ${JSON.stringify(raw)}.` };
+  }
+  if (type === "number") {
+    if (!/^-?\d+$/.test(raw)) return { ok: false, reason: `${key} must be a whole number, not ${JSON.stringify(raw)}.` };
+    return { ok: true, value: Number(raw) };
+  }
+  return { ok: true, value: raw };
+}
+
+// src/config/configCmd.ts
+var USAGE = "Use: corenel config list | get <key> | set <key> <value> | unset <key> | add <key> <value> | remove <key> <value>";
+function render(value) {
+  if (Array.isArray(value)) return value.length ? value.join(", ") : "(none)";
+  if (value === void 0) return "(unset)";
+  return String(value);
+}
+function row(key, value, origin) {
+  return `  ${key.padEnd(18)} ${render(value).padEnd(24)} (${origin})`;
+}
+function keyOrReason(name) {
+  if (SECRET_KEYS.includes(name)) {
+    return { reason: `${name} is a credential and does not belong in daemon.json. It goes in auth.json.` };
+  }
+  const key = resolveKeyName(name);
+  if (!key) return { reason: `"${name}" is not a daemon.json setting. ${USAGE}` };
+  return { key };
+}
+async function runConfig(raw, io) {
+  const argv = stripStateDir(raw);
+  const sub = argv[0];
+  const { config, unknown, corrupt } = await readDaemonConfig(io.stateDir);
+  const isWrite = sub === "set" || sub === "unset" || sub === "add" || sub === "remove";
+  if (corrupt && isWrite) {
+    io.err(`daemon.json in ${io.stateDir} is not valid JSON; fix or delete it before writing.`);
+    return 2;
+  }
+  const read3 = (key) => {
+    const value = config[key];
+    return { value, origin: value === void 0 ? "default" : "file" };
+  };
+  const commit = async (next, said) => {
+    await writeDaemonConfig(io.stateDir, next, unknown);
+    io.out(`${said} A running daemon picks this up on restart.`);
+    return 0;
+  };
+  if (sub === "list") {
+    for (const key of Object.keys(KEY_TYPES).sort()) {
+      const { value, origin } = read3(key);
+      io.out(row(key, value, origin));
+    }
+    const extras = Object.keys(unknown);
+    if (extras.length) {
+      io.out("");
+      io.out("  Keys this version does not manage (kept as they are):");
+      for (const k2 of extras.sort()) io.out(`    ${k2.padEnd(18)} ${render(unknown[k2])}`);
+    }
+    if (corrupt) io.err(`daemon.json in ${io.stateDir} is not valid JSON; these are the defaults, not what the file says.`);
+    return 0;
+  }
+  if (sub === "get") {
+    const name = argv[1];
+    if (!name) {
+      io.err(`corenel config get needs a key. ${USAGE}`);
+      return 2;
+    }
+    const found = keyOrReason(name);
+    if ("reason" in found) {
+      io.err(found.reason);
+      return 2;
+    }
+    const { value, origin } = read3(found.key);
+    io.out(`  ${render(value).padEnd(24)} (${origin})`);
+    return 0;
+  }
+  if (sub === "set") {
+    const name = argv[1];
+    const values = argv.slice(2);
+    if (!name) {
+      io.err(`corenel config set needs a key. ${USAGE}`);
+      return 2;
+    }
+    const found = keyOrReason(name);
+    if ("reason" in found) {
+      io.err(found.reason);
+      return 2;
+    }
+    if (values.length === 0) {
+      io.err(`corenel config set ${name} needs a value.`);
+      return 2;
+    }
+    if (isListKey(found.key)) {
+      await commit({ ...config, [found.key]: values }, `Set ${found.key} to ${values.join(", ")}.`);
+      return 0;
+    }
+    if (values.length > 1) {
+      io.err(`${found.key} holds one value; give just one.`);
+      return 2;
+    }
+    const coerced = coerceValue(found.key, values[0]);
+    if (!coerced.ok) {
+      io.err(coerced.reason);
+      return 2;
+    }
+    return commit({ ...config, [found.key]: coerced.value }, `Set ${found.key} to ${String(coerced.value)}.`);
+  }
+  if (sub === "unset") {
+    const name = argv[1];
+    if (!name) {
+      io.err(`corenel config unset needs a key. ${USAGE}`);
+      return 2;
+    }
+    const found = keyOrReason(name);
+    if ("reason" in found) {
+      io.err(found.reason);
+      return 2;
+    }
+    const next = { ...config };
+    delete next[found.key];
+    return commit(next, `Unset ${found.key}; the default applies again.`);
+  }
+  if (sub === "add" || sub === "remove") {
+    const name = argv[1];
+    const value = argv[2];
+    if (!name || !value) {
+      io.err(`corenel config ${sub} needs a key and a value.`);
+      return 2;
+    }
+    const found = keyOrReason(name);
+    if ("reason" in found) {
+      io.err(found.reason);
+      return 2;
+    }
+    if (!isListKey(found.key)) {
+      io.err(`${found.key} holds one value; change it with: corenel config set ${name} <value>`);
+      return 2;
+    }
+    const raw2 = config[found.key];
+    const list = Array.isArray(raw2) ? raw2 : [];
+    if (sub === "add") {
+      if (list.includes(value)) {
+        io.out(`${value} is already in ${found.key}.`);
+        return 0;
+      }
+      return commit({ ...config, [found.key]: [...list, value] }, `Added ${value} to ${found.key}.`);
+    }
+    if (!list.includes(value)) {
+      io.err(`${value} is not in ${found.key}.`);
+      return 2;
+    }
+    return commit(
+      { ...config, [found.key]: list.filter((v2) => v2 !== value) },
+      `Removed ${value} from ${found.key}.`
+    );
+  }
+  io.err(`Unknown subcommand "${sub ?? ""}". ${USAGE}`);
   return 2;
 }
 
@@ -47253,7 +47485,7 @@ async function main() {
     await runAcpAgent(rawArgv.slice(1));
     return;
   }
-  if (rawArgv[0] === "setup" || rawArgv[0] === "roots" || rawArgv[0] === "doctor") {
+  if (rawArgv[0] === "setup" || rawArgv[0] === "roots" || rawArgv[0] === "add-under" || rawArgv[0] === "config" || rawArgv[0] === "doctor") {
     const sub = rawArgv[0];
     const rest = rawArgv.slice(1);
     try {
@@ -47266,6 +47498,8 @@ async function main() {
       };
       if (sub === "setup") process.exit(await runSetup(rest, io));
       if (sub === "roots") process.exit(await runRoots(rest, io));
+      if (sub === "add-under") process.exit(await runAddUnder(rest, io));
+      if (sub === "config") process.exit(await runConfig(rest, io));
       const { args: flagArgs2, explicit: explicit2 } = parseArgsWithProvenance(rest);
       const { config, corrupt } = await readDaemonConfig(io.stateDir);
       const { args: args2, from, warnings } = layerConfig(flagArgs2, explicit2, config);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@corenel/sidecar",
-  "version": "0.6.1",
+  "version": "0.6.2",
   "type": "module",
   "license": "Elastic-2.0",
   "description": "Prompd sidecar — a local capability server. Run it next to Prompd (prompd.app) so the browser app can reach your machine: local LLMs (Ollama/LM Studio/vLLM) without CORS, your filesystem, and (opt-in) shell.",