@getmonoceros/workbench 1.20.0 → 1.20.2

package/dist/bin.js

@@ -3259,8 +3259,8 @@ function removeRepoFromDoc(doc, urlOrPath) {
     if (!isMap2(item)) return false;
     const url = item.get("url");
     if (url === urlOrPath) return true;
-    const path24 = item.get("path");
-    const effectivePath = typeof path24 === "string" ? path24 : typeof url === "string" ? deriveRepoName(url) : void 0;
+    const path25 = item.get("path");
+    const effectivePath = typeof path25 === "string" ? path25 : typeof url === "string" ? deriveRepoName(url) : void 0;
     return effectivePath === urlOrPath;
   });
   if (idx < 0) return false;
@@ -3372,7 +3372,7 @@ async function runAddRepo(input) {
       "Missing repo URL. Usage: monoceros add-repo <containername> <url>."
     );
   }
-  const path24 = (input.path ?? deriveRepoName(url)).trim();
+  const path25 = (input.path ?? deriveRepoName(url)).trim();
   const hasName = typeof input.gitName === "string" && input.gitName.trim().length > 0;
   const hasEmail = typeof input.gitEmail === "string" && input.gitEmail.trim().length > 0;
   if (hasName !== hasEmail) {
@@ -3409,7 +3409,7 @@ async function runAddRepo(input) {
   const providerToWrite = !canonical && explicitProvider ? explicitProvider : void 0;
   const entry2 = {
     url,
-    path: path24,
+    path: path25,
     ...hasName && hasEmail ? {
       gitUser: {
         name: input.gitName.trim(),
@@ -4913,8 +4913,13 @@ function generateAgentsMd(input) {
   lines.push("## Conventions and pitfalls");
   lines.push("");
   lines.push(
-    `- Workspace path: \`/workspaces/${input.containerName}/projects/<repo>/\`.`,
-    "  Cloned repos are git repositories \u2014 commit normally.",
+    `- **Build everything under \`/workspaces/${input.containerName}/projects/\`.**`,
+    "  That is the project workspace \u2014 create new apps and scaffolding there",
+    "  (e.g. `projects/<app>/`), and `cd` into it before generating files. Do",
+    `  **not** put project files at the workspace root \`/workspaces/${input.containerName}\`:`,
+    "  it holds Monoceros-managed directories (`.devcontainer/`, `home/`,",
+    "  `data/`, `logs/`), not your code. Cloned repos already live at",
+    "  `projects/<repo>/` and are git repositories \u2014 commit normally.",
     "- You run as the `node` user. `sudo` is available but its effects do",
     "  not persist across rebuilds.",
     "- A bare `EXPOSE` directive has no effect on host reachability. Ports",
@@ -6407,7 +6412,7 @@ var CLI_VERSION;
 var init_version = __esm({
   "src/version.ts"() {
     "use strict";
-    CLI_VERSION = true ? "1.20.0" : "dev";
+    CLI_VERSION = true ? "1.20.2" : "dev";
   }
 });
 
@@ -8802,9 +8807,52 @@ var init_browser_bridge = __esm({
   }
 });
 
-// src/devcontainer/shell.ts
-import { existsSync as existsSync14 } from "fs";
+// src/devcontainer/claude-trust.ts
+import { existsSync as existsSync14, promises as fsp3 } from "fs";
 import path22 from "path";
+function resolveContainerCwd(name, cwd) {
+  const workspace = `/workspaces/${name}`;
+  if (!cwd) return workspace;
+  return path22.posix.isAbsolute(cwd) ? cwd : path22.posix.join(workspace, cwd);
+}
+async function preApproveClaudeProject(opts) {
+  const file = path22.join(opts.root, "home", ".claude.json");
+  if (!existsSync14(file)) return;
+  try {
+    const raw = await fsp3.readFile(file, "utf8");
+    const config = raw.trim() ? JSON.parse(raw) : {};
+    if (typeof config !== "object" || config === null) return;
+    const dir = resolveContainerCwd(opts.name, opts.cwd);
+    if (typeof config.projects !== "object" || config.projects === null) {
+      config.projects = {};
+    }
+    if (typeof config.projects[dir] !== "object" || config.projects[dir] === null) {
+      config.projects[dir] = {};
+    }
+    const entry2 = config.projects[dir];
+    if (entry2.hasTrustDialogAccepted === true && entry2.hasClaudeMdExternalIncludesApproved === true && entry2.hasClaudeMdExternalIncludesWarningShown === true) {
+      return;
+    }
+    entry2.hasTrustDialogAccepted = true;
+    entry2.hasClaudeMdExternalIncludesApproved = true;
+    entry2.hasClaudeMdExternalIncludesWarningShown = true;
+    if (typeof entry2.projectOnboardingSeenCount !== "number") {
+      entry2.projectOnboardingSeenCount = 1;
+    }
+    await fsp3.writeFile(file, `${JSON.stringify(config, null, 2)}
+`);
+  } catch {
+  }
+}
+var init_claude_trust = __esm({
+  "src/devcontainer/claude-trust.ts"() {
+    "use strict";
+  }
+});
+
+// src/devcontainer/shell.ts
+import { existsSync as existsSync15 } from "fs";
+import path23 from "path";
 async function runShell(opts) {
   assertContainerExists(opts.root);
   const spawnFn = opts.spawn ?? spawnDevcontainer;
@@ -8827,7 +8875,7 @@ async function runShell(opts) {
   );
 }
 function assertContainerExists(root) {
-  if (!existsSync14(path22.join(root, ".devcontainer"))) {
+  if (!existsSync15(path23.join(root, ".devcontainer"))) {
     throw new Error(
       `No .devcontainer/ at ${root}. Run \`monoceros apply <name>\` first.`
     );
@@ -8873,6 +8921,13 @@ async function runInContainer(opts) {
     { quiet: true }
   );
   if (upCode !== 0) return upCode;
+  if (opts.name) {
+    await preApproveClaudeProject({
+      root: opts.root,
+      name: opts.name,
+      ...opts.cwd ? { cwd: opts.cwd } : {}
+    });
+  }
   const bridge = opts.name && process.stdout.isTTY ? await startBrowserBridge({
     name: opts.name,
     root: opts.root,
@@ -8902,6 +8957,7 @@ var init_run = __esm({
   "src/devcontainer/run.ts"() {
     "use strict";
     init_browser_bridge();
+    init_claude_trust();
     init_cli();
     init_shell();
   }
@@ -9137,11 +9193,11 @@ var init_stop = __esm({
 });
 
 // src/tunnel/resolve.ts
-import { existsSync as existsSync15 } from "fs";
-import path23 from "path";
+import { existsSync as existsSync16 } from "fs";
+import path24 from "path";
 async function resolveTunnelTarget(opts) {
   const ymlPath = containerConfigPath(opts.name, opts.monocerosHome);
-  if (!existsSync15(ymlPath)) {
+  if (!existsSync16(ymlPath)) {
     throw new Error(
       `No yml profile for '${opts.name}' at ${ymlPath}. Run \`monoceros init ${opts.name}\` first.`
     );
@@ -9149,13 +9205,13 @@ async function resolveTunnelTarget(opts) {
   const parsed = await readConfig(ymlPath);
   const config = parsed.config;
   const containerRoot = containerDir(opts.name, opts.monocerosHome);
-  if (!existsSync15(containerRoot)) {
+  if (!existsSync16(containerRoot)) {
     throw new Error(
       `Container '${opts.name}' is not materialised at ${containerRoot}. Run \`monoceros apply ${opts.name}\` first.`
     );
   }
-  const composePath = path23.join(containerRoot, ".devcontainer", "compose.yaml");
-  const isCompose = existsSync15(composePath);
+  const composePath = path24.join(containerRoot, ".devcontainer", "compose.yaml");
+  const isCompose = existsSync16(composePath);
   const parsedTarget = parseTargetArg(opts.target, config);
   const docker = opts.docker ?? defaultDockerExec;
   if (isCompose) {
@@ -9574,7 +9630,7 @@ var init_tunnel = __esm({
 });
 
 // src/upgrade/index.ts
-import { existsSync as existsSync16, promises as fs17 } from "fs";
+import { existsSync as existsSync17, promises as fs17 } from "fs";
 import { consola as consola34 } from "consola";
 async function fetchRuntimeVersions() {
   const tokenUrl = `https://ghcr.io/token?service=ghcr.io&scope=repository:${RUNTIME_REPO}:pull`;
@@ -9633,7 +9689,7 @@ async function runUpgrade(opts) {
     );
   }
   const ymlPath = containerConfigPath(opts.name, home);
-  if (!existsSync16(ymlPath)) {
+  if (!existsSync17(ymlPath)) {
     throw new Error(
       `No such config: ${ymlPath}. Run \`monoceros init <template> ${opts.name}\` first.`
     );
@@ -10063,25 +10119,25 @@ function detectHelpRequest(argv, main2) {
   const separatorIdx = argv.indexOf("--");
   if (helpIdx === -1) return null;
   if (separatorIdx !== -1 && separatorIdx < helpIdx) return null;
-  const path24 = [];
+  const path25 = [];
   const tokens = argv.slice(
     0,
     separatorIdx === -1 ? argv.length : separatorIdx
   );
   let cursor = main2;
   const mainName = (main2.meta ?? {}).name ?? "monoceros";
-  path24.push(mainName);
+  path25.push(mainName);
   for (const tok of tokens) {
     if (tok.startsWith("-")) continue;
     const subs = cursor.subCommands ?? {};
     if (tok in subs) {
       cursor = subs[tok];
-      path24.push(tok);
+      path25.push(tok);
       continue;
     }
     break;
   }
-  return { path: path24, cmd: cursor };
+  return { path: path25, cmd: cursor };
 }
 async function maybeRenderHelp(argv, main2) {
   const hit = detectHelpRequest(argv, main2);