@rashidee/co2 1.3.7 → 1.3.9

package/dist/index.js

@@ -6809,7 +6809,7 @@ var {
 // package.json
 var package_default = {
   name: "@rashidee/co2",
-  version: "1.3.7",
+  version: "1.3.9",
   description: "Compound Context Studio \u2014 self-hosted team context authoring for CO2 projects",
   type: "module",
   license: "MIT",
@@ -19258,8 +19258,13 @@ var mockupHubStatusSchema = external_exports.object({
   // HTTP probe on the hub port succeeded
   port: external_exports.number().int().nullable(),
   // resolved port (null when hub absent)
-  url: external_exports.string().nullable()
+  url: external_exports.string().nullable(),
   // client-facing URL (request host + hub port)
+  // Prefill for the Mockup page's port input: the configured/running port when known,
+  // else the first unused port starting from 4000.
+  suggestedPort: external_exports.number().int(),
+  // True while the hub process was spawned by (and is stoppable from) co2-cli itself.
+  spawned: external_exports.boolean()
 });
 
 // ../core/src/schemas/notification.ts
@@ -19747,12 +19752,14 @@ var zValidator = (target, schema, hook) => (
 
 // ../server/src/features/artifact/mockup-hub.ts
 import { spawn } from "child_process";
-import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
+import { existsSync as existsSync2, readFileSync as readFileSync2, writeFileSync } from "fs";
 import { request as httpRequest } from "http";
+import { connect, createServer } from "net";
 import { join as join2 } from "path";
 function svcError(code, status) {
   return Object.assign(new Error(code), { code, status });
 }
+var HUB_PORT_SCAN_START = 4e3;
 var spawnedHubs = /* @__PURE__ */ new Map();
 function killSpawnedHubs() {
   for (const [, child] of spawnedHubs) {
@@ -19775,14 +19782,14 @@ function resolveHub(db, workspacePath, projectId) {
   const hubDir = [join2(projectDir2, "mockup"), join2(projectDir2, "source", "mockup")].find(
     (d) => existsSync2(join2(d, "server.js"))
   );
-  if (!hubDir) return { hubDir: join2(projectDir2, "mockup"), present: false, port: 3e3 };
-  let port = 3e3;
+  if (!hubDir) return { hubDir: join2(projectDir2, "mockup"), present: false, configPort: null };
+  let configPort = null;
   try {
     const config = JSON.parse(readFileSync2(join2(hubDir, "mockup.config.json"), "utf8"));
-    if (typeof config.port === "number") port = config.port;
+    if (typeof config.port === "number") configPort = config.port;
   } catch {
   }
-  return { hubDir, present: true, port };
+  return { hubDir, present: true, configPort };
 }
 function probeHub(port, timeoutMs = 1e3) {
   return new Promise((resolve5) => {
@@ -19801,40 +19808,112 @@ function probeHub(port, timeoutMs = 1e3) {
     req.end();
   });
 }
-function toStatus(location, running, requestHost) {
+function tcpBusy(port, timeoutMs = 400) {
+  return new Promise((resolve5) => {
+    const sock = connect({ host: "127.0.0.1", port, timeout: timeoutMs });
+    sock.once("connect", () => {
+      sock.destroy();
+      resolve5(true);
+    });
+    sock.once("timeout", () => {
+      sock.destroy();
+      resolve5(false);
+    });
+    sock.once("error", () => resolve5(false));
+  });
+}
+async function isPortFree(port) {
+  if (await tcpBusy(port)) return false;
+  return new Promise((resolve5) => {
+    const probe2 = createServer();
+    probe2.once("error", () => resolve5(false));
+    probe2.listen(port, "0.0.0.0", () => {
+      probe2.close(() => resolve5(true));
+    });
+  });
+}
+async function findUnusedPort(start = HUB_PORT_SCAN_START) {
+  for (let port = start; port < start + 100; port++) {
+    if (await isPortFree(port)) return port;
+  }
+  return start;
+}
+async function detectHub(location) {
+  if (!location.present || !location.configPort) {
+    return { location, running: false, activePort: null };
+  }
+  const running = await probeHub(location.configPort);
+  return { location, running, activePort: location.configPort };
+}
+async function toStatus(state, requestHost, projectId) {
   const hostname = requestHost.replace(/:\d+$/, "") || "localhost";
+  const { location, running, activePort } = state;
+  const suggestedPort = activePort ?? await findUnusedPort();
+  const child = spawnedHubs.get(projectId);
   return {
     present: location.present,
     running,
-    port: location.present ? location.port : null,
-    url: location.present ? `http://${hostname}:${location.port}/` : null
+    port: location.present ? activePort : null,
+    url: location.present && activePort ? `http://${hostname}:${activePort}/` : null,
+    suggestedPort,
+    spawned: running && child != null && child.exitCode === null
   };
 }
 async function getMockupHubStatus(db, workspacePath, projectId, requestHost) {
   const location = resolveHub(db, workspacePath, projectId);
-  const running = location.present ? await probeHub(location.port) : false;
-  return toStatus(location, running, requestHost);
+  return toStatus(await detectHub(location), requestHost, projectId);
 }
-async function startMockupHub(db, workspacePath, projectId, requestHost) {
+async function startMockupHub(db, workspacePath, projectId, requestHost, port) {
   const location = resolveHub(db, workspacePath, projectId);
   if (!location.present) throw svcError("MOCKUP_HUB_MISSING", 404);
-  if (await probeHub(location.port)) return toStatus(location, true, requestHost);
+  const targetPort = port ?? location.configPort ?? await findUnusedPort();
+  if (await probeHub(targetPort)) {
+    return toStatus({ location, running: true, activePort: targetPort }, requestHost, projectId);
+  }
+  if (targetPort !== location.configPort) {
+    try {
+      writeFileSync(
+        join2(location.hubDir, "mockup.config.json"),
+        `${JSON.stringify({ port: targetPort }, null, 2)}
+`
+      );
+      location.configPort = targetPort;
+    } catch {
+    }
+  }
   const existing = spawnedHubs.get(projectId);
-  if (!existing || existing.exitCode !== null) {
-    const child = spawn(process.execPath, ["server.js"], {
-      cwd: location.hubDir,
-      stdio: "ignore",
-      env: { ...process.env, PORT: String(location.port) }
-    });
-    child.on("error", () => spawnedHubs.delete(projectId));
-    child.on("exit", () => spawnedHubs.delete(projectId));
-    spawnedHubs.set(projectId, child);
+  if (existing && existing.exitCode === null) {
+    try {
+      existing.kill();
+    } catch {
+    }
+    spawnedHubs.delete(projectId);
   }
+  const child = spawn(process.execPath, ["server.js"], {
+    cwd: location.hubDir,
+    stdio: "ignore",
+    env: { ...process.env, PORT: String(targetPort) }
+  });
+  child.on("error", () => spawnedHubs.delete(projectId));
+  child.on("exit", () => spawnedHubs.delete(projectId));
+  spawnedHubs.set(projectId, child);
   for (let attempt = 0; attempt < 20; attempt++) {
-    if (await probeHub(location.port, 500)) return toStatus(location, true, requestHost);
+    if (await probeHub(targetPort, 500)) {
+      return toStatus({ location, running: true, activePort: targetPort }, requestHost, projectId);
+    }
     await new Promise((r) => setTimeout(r, 250));
   }
-  return toStatus(location, false, requestHost);
+  return toStatus({ location, running: false, activePort: targetPort }, requestHost, projectId);
+}
+function stopMockupHub(projectId) {
+  const child = spawnedHubs.get(projectId);
+  if (!child) return false;
+  try {
+    child.kill();
+  } catch {
+  }
+  spawnedHubs.delete(projectId);
+  return true;
 }
 
 // ../server/src/features/artifact/service.ts
@@ -20089,19 +20168,39 @@ function artifactRoutes(db, workspacePath) {
       return errorResponse(c, e);
     }
   });
-  app.post("/mockup-hub/start", zValidator("json", hubQuerySchema), async (c) => {
+  const hubStartSchema = hubQuerySchema.extend({
+    port: external_exports.coerce.number().int().min(1024).max(65535).optional()
+  });
+  app.post("/mockup-hub/start", zValidator("json", hubStartSchema), async (c) => {
     try {
+      const { projectId, port } = c.req.valid("json");
       const status = await startMockupHub(
         db,
         workspacePath,
-        c.req.valid("json").projectId,
-        c.req.header("host") ?? "localhost"
+        projectId,
+        c.req.header("host") ?? "localhost",
+        port
       );
       return c.json(status);
     } catch (e) {
       return errorResponse(c, e);
     }
   });
+  app.post("/mockup-hub/stop", zValidator("json", hubQuerySchema), async (c) => {
+    try {
+      const { projectId } = c.req.valid("json");
+      const host = c.req.header("host") ?? "localhost";
+      const stopped = stopMockupHub(projectId);
+      let status = await getMockupHubStatus(db, workspacePath, projectId, host);
+      for (let attempt = 0; stopped && status.running && attempt < 8; attempt++) {
+        await new Promise((r) => setTimeout(r, 250));
+        status = await getMockupHubStatus(db, workspacePath, projectId, host);
+      }
+      return c.json({ stopped, status });
+    } catch (e) {
+      return errorResponse(c, e);
+    }
+  });
   app.get("/:id/content", (c) => {
     const id = Number(c.req.param("id"));
     if (Number.isNaN(id)) return c.json({ code: "INVALID_ID" }, 400);
@@ -20116,7 +20215,7 @@ function artifactRoutes(db, workspacePath) {
 }
 
 // ../server/src/features/brainstorm/service.ts
-import { existsSync as existsSync7, mkdirSync as mkdirSync2, readFileSync as readFileSync5, writeFileSync as writeFileSync3 } from "fs";
+import { existsSync as existsSync7, mkdirSync as mkdirSync2, readFileSync as readFileSync5, writeFileSync as writeFileSync4 } from "fs";
 import { join as join8 } from "path";
 
 // ../server/src/features/notification/service.ts
@@ -20172,11 +20271,11 @@ function filterClause(userId, filter) {
 import { join as join7 } from "path";
 
 // ../server/src/features/context-authoring/prd-file.ts
-import { existsSync as existsSync5, readFileSync as readFileSync4, readdirSync as readdirSync2, writeFileSync as writeFileSync2 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync4, readdirSync as readdirSync2, writeFileSync as writeFileSync3 } from "fs";
 import { join as join5 } from "path";
 
 // ../server/src/features/context-authoring/service.ts
-import { existsSync as existsSync4, mkdirSync, writeFileSync } from "fs";
+import { existsSync as existsSync4, mkdirSync, writeFileSync as writeFileSync2 } from "fs";
 import { join as join4 } from "path";
 function svcError3(code, status) {
   return Object.assign(new Error(code), { code, status });
@@ -20322,7 +20421,7 @@ Run in the Workspace Terminal:
 
     /util-updprd "${description.trim().replace(/"/g, '\\"')}"
 `;
-  writeFileSync(abs, body, "utf-8");
+  writeFileSync2(abs, body, "utf-8");
   const relative3 = join4(project.folder, "execution", "prd_updates", fileName).replace(/\\/g, "/");
   return { markdownPath: relative3 };
 }
@@ -20726,7 +20825,7 @@ function writeFacetToDisk(db, workspacePath, projectId, moduleId, prdVersionId,
       ...newBody,
       ""
     );
-    writeFileSync2(target.prdPath, lines.join("\n"), "utf8");
+    writeFileSync3(target.prdPath, lines.join("\n"), "utf8");
     return;
   }
   let facetStart = -1;
@@ -20746,7 +20845,7 @@ function writeFacetToDisk(db, workspacePath, projectId, moduleId, prdVersionId,
     while (insertAt > moduleStart + 1 && (!lines[insertAt - 1].trim() || /^-{3,}$/.test(lines[insertAt - 1].trim())))
       insertAt--;
     lines.splice(insertAt, 0, "", `### ${FACET_HEADING[facet]}`, ...newBody);
-    writeFileSync2(target.prdPath, lines.join("\n"), "utf8");
+    writeFileSync3(target.prdPath, lines.join("\n"), "utf8");
     return;
   }
   let end = facetEnd;
@@ -20796,7 +20895,7 @@ function writeFacetToDisk(db, workspacePath, projectId, moduleId, prdVersionId,
     rebuilt.push(...blockLines);
   }
   lines.splice(facetStart, end - facetStart, ...rebuilt);
-  writeFileSync2(target.prdPath, lines.join("\n"), "utf8");
+  writeFileSync3(target.prdPath, lines.join("\n"), "utf8");
 }
 function resolveSectionPrdPath(db, workspacePath, projectId, applicationId) {
   const project = db.select().from(projects).where(eq(projects.id, projectId)).limit(1).get();
@@ -20838,7 +20937,7 @@ function writeSectionToDisk(db, workspacePath, projectId, applicationId, section
     while (end > sectionStart + 1 && (!lines[end - 1].trim() || /^-{3,}$/.test(lines[end - 1].trim())))
       end--;
     lines.splice(sectionStart, end - sectionStart, `# ${PRD_SECTION_HEADING[sectionType]}`, ...body);
-    writeFileSync2(prdPath, lines.join("\n"), "utf8");
+    writeFileSync3(prdPath, lines.join("\n"), "utf8");
     return;
   }
   const laterSections = new Set(PRD_SECTION_ORDER.slice(PRD_SECTION_ORDER.indexOf(sectionType) + 1));
@@ -20859,7 +20958,7 @@ function writeSectionToDisk(db, workspacePath, projectId, applicationId, section
   } else {
     lines.splice(insertAt, 0, ...block, "", "---", "");
   }
-  writeFileSync2(prdPath, lines.join("\n"), "utf8");
+  writeFileSync3(prdPath, lines.join("\n"), "utf8");
 }
 
 // ../server/src/features/workflow/git-service.ts
@@ -21444,7 +21543,7 @@ function createSession(db, workspacePath, projectId, userId, username, title) {
     createdAt: nowIso,
     updatedAt: nowIso
   }).returning().get();
-  writeFileSync3(
+  writeFileSync4(
     sessionAbsPath(workspacePath, project.folder, brainstormFilePath),
     template,
     "utf-8"
@@ -21519,7 +21618,7 @@ function updateSession(db, workspacePath, projectId, sessionId, patch) {
   if (patch.ideaMarkdown !== void 0 && session.brainstormFilePath) {
     const abs = sessionAbsPath(workspacePath, project.folder, session.brainstormFilePath);
     mkdirSync2(join8(abs, ".."), { recursive: true });
-    writeFileSync3(abs, patch.ideaMarkdown, "utf-8");
+    writeFileSync4(abs, patch.ideaMarkdown, "utf-8");
   }
 }
 function addReference(db, workspacePath, projectId, sessionId, file) {
@@ -21532,7 +21631,7 @@ function addReference(db, workspacePath, projectId, sessionId, file) {
   const safeName = safeSegment(file.name);
   const storageRel = `${folderRel}/${safeName}`;
   mkdirSync2(sessionAbsPath(workspacePath, project.folder, folderRel), { recursive: true });
-  writeFileSync3(sessionAbsPath(workspacePath, project.folder, storageRel), file.bytes);
+  writeFileSync4(sessionAbsPath(workspacePath, project.folder, storageRel), file.bytes);
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const inserted = db.insert(brainstormReferences).values({
     brainstormSessionId: session.id,
@@ -21799,7 +21898,7 @@ import { existsSync as existsSync10 } from "fs";
 import { join as join11 } from "path";
 
 // ../server/src/features/prd-wizard/service.ts
-import { existsSync as existsSync9, mkdirSync as mkdirSync3, statSync as statSync2, writeFileSync as writeFileSync4 } from "fs";
+import { existsSync as existsSync9, mkdirSync as mkdirSync3, statSync as statSync2, writeFileSync as writeFileSync5 } from "fs";
 import { join as join10 } from "path";
 function svcError7(code, status) {
   return Object.assign(new Error(code), { code, status });
@@ -21877,7 +21976,7 @@ function generatePrdWizardMarkdown(db, workspacePath, requestId, targetModule) {
     `execution/${filename}`,
     targetModule
   );
-  writeFileSync4(filePath, markdown, "utf8");
+  writeFileSync5(filePath, markdown, "utf8");
   db.update(prdWizardRequests).set({
     generatedMarkdownPath: filePath,
     status: "generated",
@@ -22114,7 +22213,7 @@ function evaluateBuildGuard(db, workspacePath, projectId, versionId) {
 }
 
 // ../server/src/features/cicd/service.ts
-import { appendFileSync, existsSync as existsSync12, mkdirSync as mkdirSync4, statSync as statSync4, writeFileSync as writeFileSync5 } from "fs";
+import { appendFileSync, existsSync as existsSync12, mkdirSync as mkdirSync4, statSync as statSync4, writeFileSync as writeFileSync6 } from "fs";
 import { join as join13 } from "path";
 
 // ../server/src/features/batch-job/constants.ts
@@ -22257,7 +22356,7 @@ function requestPlan(db, workspacePath, projectId, userId) {
   const filename = `cicd-plan-${setup.id}-${Date.now()}.md`;
   const filePath = join13(executionDir, filename);
   const relative3 = `execution/${filename}`;
-  writeFileSync5(
+  writeFileSync6(
     filePath,
     buildPlanRequestMarkdown(
       project.name,
@@ -22567,11 +22666,11 @@ function cicdGuardRoutes(db, workspacePath) {
 }
 
 // ../server/src/features/project/service.ts
-import { existsSync as existsSync14, mkdirSync as mkdirSync6, readFileSync as readFileSync9, writeFileSync as writeFileSync7 } from "fs";
+import { existsSync as existsSync14, mkdirSync as mkdirSync6, readFileSync as readFileSync9, writeFileSync as writeFileSync8 } from "fs";
 import { join as join16 } from "path";
 
 // ../server/src/features/project-config/service.ts
-import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync6 } from "fs";
+import { mkdirSync as mkdirSync5, writeFileSync as writeFileSync7 } from "fs";
 import { join as join15 } from "path";
 function svcError9(code, status) {
   return Object.assign(new Error(code), { code, status });
@@ -22595,7 +22694,7 @@ function resolveImportedByName(db, importedBy) {
 function writeProjectFile(workspacePath, folder, fileName, content) {
   const dir = join15(workspacePath, folder);
   mkdirSync5(dir, { recursive: true });
-  writeFileSync6(join15(dir, fileName), content, "utf8");
+  writeFileSync7(join15(dir, fileName), content, "utf8");
 }
 function toDto5(db, row, field) {
   return {
@@ -22741,8 +22840,8 @@ function scaffoldProjectFolder(workspacePath, folderName, name, baseIdea) {
     "# Feedback",
     "<!-- Human answers appear here -->"
   ].join("\n");
-  writeFileSync7(join16(projectDir2, `${folderName}.brainstorm.md`), template, "utf8");
-  writeFileSync7(
+  writeFileSync8(join16(projectDir2, `${folderName}.brainstorm.md`), template, "utf8");
+  writeFileSync8(
     join16(projectDir2, "context", "references", "brainstorm-protocol.md"),
     "# Brainstorm Protocol\n\n[Installed by the co2 plugin]\n",
     "utf8"
@@ -22780,7 +22879,7 @@ function updateBrainstormMd(db, workspacePath, projectId, content) {
     project.workspaceFolderName,
     `${project.workspaceFolderName}.brainstorm.md`
   );
-  writeFileSync7(filePath, content, "utf8");
+  writeFileSync8(filePath, content, "utf8");
 }
 function listProjects(db, archived) {
   return db.select({
@@ -22903,7 +23002,7 @@ function regenerateCO2Files(db, workspacePath, projectId) {
   const projectDir2 = join16(workspacePath, project.workspaceFolderName);
   mkdirSync6(projectDir2, { recursive: true });
   const apps = db.select().from(applications).where(and(eq(applications.projectId, projectId), eq(applications.isDeleted, 0))).all();
-  writeFileSync7(
+  writeFileSync8(
     join16(projectDir2, "CLAUDE.md"),
     project.rawClaudeMd ?? buildClaudeMd(project.name, apps),
     "utf8"
@@ -22920,7 +23019,7 @@ function regenerateCO2Files(db, workspacePath, projectId) {
     const appRel = resolveAppFolderName(projectDir2, app.name);
     const appDir = join16(projectDir2, appRel, "context");
     mkdirSync6(appDir, { recursive: true });
-    writeFileSync7(
+    writeFileSync8(
       join16(appDir, "PRD.md"),
       prdSnapshot[String(app.id)] ?? buildPrdMd(app.name, mods, loadPrdSections(db, app.id)),
       "utf8"
@@ -23313,7 +23412,7 @@ function dashboardRoutes(db) {
 }
 
 // ../server/src/features/defect/service.ts
-import { existsSync as existsSync15, mkdirSync as mkdirSync7, readFileSync as readFileSync10, writeFileSync as writeFileSync8 } from "fs";
+import { existsSync as existsSync15, mkdirSync as mkdirSync7, readFileSync as readFileSync10, writeFileSync as writeFileSync9 } from "fs";
 import { join as join17 } from "path";
 
 // ../server/src/features/project-import/bug-md.ts
@@ -23745,7 +23844,7 @@ function writeBugMdFile(db, workspacePath, app, projectFolderName) {
   const appRel = resolveAppFolderName(projectDir2, app.name);
   const appContextDir = join17(projectDir2, appRel, "context");
   mkdirSync7(appContextDir, { recursive: true });
-  writeFileSync8(join17(appContextDir, "BUG.md"), content, "utf8");
+  writeFileSync9(join17(appContextDir, "BUG.md"), content, "utf8");
   return { content, bugCount: bugs.length };
 }
 function syncBugStatusesFromMaster(db, trackingFilePath, applicationId) {
@@ -23789,7 +23888,7 @@ function syncBugMdToDisk(db, workspacePath, applicationId, bugId, mode = "replac
           ).all().find((m) => m.name.toLowerCase() === bug.module?.toLowerCase())?.category : void 0) ?? null;
           const merged = mergeBugIntoBugMd(readFileSync10(file, "utf8"), bug, semver, category, mode);
           if (merged !== null) {
-            writeFileSync8(file, merged, "utf8");
+            writeFileSync9(file, merged, "utf8");
             return;
           }
         }
@@ -23923,7 +24022,7 @@ function defectRoutes(db, workspacePath) {
 }
 
 // ../server/src/features/document/service.ts
-import { existsSync as existsSync16, mkdirSync as mkdirSync8, readFileSync as readFileSync11, writeFileSync as writeFileSync9 } from "fs";
+import { existsSync as existsSync16, mkdirSync as mkdirSync8, readFileSync as readFileSync11, writeFileSync as writeFileSync10 } from "fs";
 import { join as join18 } from "path";
 function svcError12(code, status) {
   return Object.assign(new Error(code), { code, status });
@@ -23936,7 +24035,7 @@ function uploadDocument(db, dataDir, projectId, file) {
   mkdirSync8(dir, { recursive: true });
   const safeName = file.name.replace(/[^a-zA-Z0-9._-]/g, "_");
   const stamped = `${Date.now()}_${safeName}`;
-  writeFileSync9(join18(dir, stamped), file.bytes);
+  writeFileSync10(join18(dir, stamped), file.bytes);
   const relativePath = `${projectId}/${stamped}`;
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const inserted = db.insert(documents).values({
@@ -24023,7 +24122,7 @@ function documentRoutes(db, dataDir) {
 
 // ../server/src/features/git/service.ts
 import { execFileSync as execFileSync3 } from "child_process";
-import { existsSync as existsSync17, readFileSync as readFileSync12, rmSync, writeFileSync as writeFileSync10 } from "fs";
+import { existsSync as existsSync17, readFileSync as readFileSync12, rmSync, writeFileSync as writeFileSync11 } from "fs";
 import { join as join19 } from "path";
 var GitServiceError = class extends Error {
   code;
@@ -24207,7 +24306,18 @@ function readWorking(dir, path) {
     return null;
   }
 }
-function commitChanges(db, workspacePath, projectId, input) {
+function identityArgs(db, userId) {
+  if (!userId) return [];
+  const user = db.select({ gitName: users.gitName, gitEmail: users.gitEmail }).from(users).where(eq(users.id, userId)).get();
+  const args = [];
+  if (user?.gitName) args.push("-c", `user.name=${user.gitName}`);
+  if (user?.gitEmail) args.push("-c", `user.email=${user.gitEmail}`);
+  return args;
+}
+function withIdentityHint(message) {
+  return /Author identity unknown|Please tell me who you are|empty ident name/i.test(message) ? `${message} \u2014 set your Git name/email on your co2 Profile page, or configure git user.name/user.email for the service account on this host.` : message;
+}
+function commitChanges(db, workspacePath, projectId, input, userId) {
   const dir = projectDir(db, workspacePath, projectId);
   if (!existsSync17(dir) || !isGitRepo(dir)) {
     throw new GitServiceError("NO_GIT_REPO", 404, "No git repository for this project");
@@ -24225,9 +24335,9 @@ function commitChanges(db, workspacePath, projectId, input) {
     if (e instanceof GitServiceError) throw e;
   }
   try {
-    git3(dir, ["commit", "-m", input.message]);
+    git3(dir, [...identityArgs(db, userId), "commit", "-m", input.message]);
   } catch (e) {
-    throw new GitServiceError("GIT_COMMIT_FAILED", 409, detail(e));
+    throw new GitServiceError("GIT_COMMIT_FAILED", 409, withIdentityHint(detail(e)));
   }
   const branch = safe(() => git3(dir, ["branch", "--show-current"])) ?? "";
   const commitHash = safe(() => git3(dir, ["rev-parse", "--short", "HEAD"])) ?? "";
@@ -24263,7 +24373,7 @@ function resolveConflict(db, workspacePath, projectId, input) {
       if (input.content === void 0) {
         throw new GitServiceError("CONTENT_REQUIRED", 400, "Manual resolution requires content");
       }
-      writeFileSync10(join19(dir, input.path), input.content, "utf8");
+      writeFileSync11(join19(dir, input.path), input.content, "utf8");
     } else {
       git3(dir, ["checkout", `--${input.resolution}`, "--", input.path]);
     }
@@ -24289,7 +24399,7 @@ function safe(fn) {
 function errorResponse7(c, e) {
   const err = e;
   const status = err.status ?? 500;
-  return c.json({ code: err.code ?? "INTERNAL_ERROR" }, status);
+  return c.json({ code: err.code ?? "INTERNAL_ERROR", message: err.message }, status);
 }
 function gitRoutes(db, workspacePath) {
   const app = new Hono2();
@@ -24318,7 +24428,7 @@ function gitRoutes(db, workspacePath) {
     if (Number.isNaN(projectId)) return c.json({ code: "INVALID_ID" }, 400);
     try {
       const body = c.req.valid("json");
-      return c.json(commitChanges(db, workspacePath, projectId, body));
+      return c.json(commitChanges(db, workspacePath, projectId, body, c.get("user")?.id));
     } catch (e) {
       return errorResponse7(c, e);
     }
@@ -24947,7 +25057,7 @@ function scanProject(db, workspacePath, folderName) {
 import { join as join22, relative as relative2 } from "path";
 
 // ../server/src/features/workflow/service.ts
-import { existsSync as existsSync19, mkdirSync as mkdirSync9, readFileSync as readFileSync14, writeFileSync as writeFileSync11 } from "fs";
+import { existsSync as existsSync19, mkdirSync as mkdirSync9, readFileSync as readFileSync14, writeFileSync as writeFileSync12 } from "fs";
 import { join as join21, relative, resolve as resolve2, sep } from "path";
 var ACTIVE_RUN_STATUSES = ["pending", "in_progress"];
 function svcError14(code, status) {
@@ -25174,7 +25284,7 @@ function generateWorkflowMarkdown(db, workspacePath, input, creatingUser, watche
     relPath
   );
   mkdirSync9(join21(projectDir2, "workflow", creatingUser.username), { recursive: true });
-  writeFileSync11(join21(projectDir2, relPath), content, "utf8");
+  writeFileSync12(join21(projectDir2, relPath), content, "utf8");
   const now = (/* @__PURE__ */ new Date()).toISOString();
   const wfm = db.insert(workflowMarkdowns).values({
     projectId: input.projectId,
@@ -26018,7 +26128,7 @@ function projectRoutes(db, workspacePath) {
 }
 
 // ../server/src/features/shared-context/service.ts
-import { existsSync as existsSync20, mkdirSync as mkdirSync10, readFileSync as readFileSync15, readdirSync as readdirSync4, statSync as statSync6, writeFileSync as writeFileSync12 } from "fs";
+import { existsSync as existsSync20, mkdirSync as mkdirSync10, readFileSync as readFileSync15, readdirSync as readdirSync4, statSync as statSync6, writeFileSync as writeFileSync13 } from "fs";
 import { join as join23, resolve as resolve3, sep as sep2 } from "path";
 function svcError16(code, status) {
   return Object.assign(new Error(code), { code, status });
@@ -26109,7 +26219,7 @@ function uploadFile(db, workspacePath, projectId, folder, file) {
   const dir = folder ? safeResolve(root, folder) : root;
   if (folder && !existsSync20(dir)) throw svcError16("FOLDER_NOT_FOUND", 404);
   const safeName = sanitizeSegment(file.name);
-  writeFileSync12(join23(dir, safeName), file.bytes);
+  writeFileSync13(join23(dir, safeName), file.bytes);
   return { path: folder ? `${folder}/${safeName}` : safeName };
 }
 function getFileContent(db, workspacePath, projectId, relPath) {
@@ -26124,7 +26234,7 @@ function saveMarkdown(db, workspacePath, projectId, relPath, content) {
   const root = resolveSharedRoot(db, workspacePath, projectId);
   const full = safeResolve(root, relPath);
   if (!existsSync20(full) || !statSync6(full).isFile()) throw svcError16("NOT_FOUND", 404);
-  writeFileSync12(full, content, "utf8");
+  writeFileSync13(full, content, "utf8");
 }
 
 // ../server/src/features/shared-context/routes.ts
@@ -27114,7 +27224,7 @@ function workspaceRoutes(_db, config, port, host, workspacePath) {
 }
 
 // ../server/src/lib/config.ts
-import { existsSync as existsSync22, readFileSync as readFileSync17, writeFileSync as writeFileSync13 } from "fs";
+import { existsSync as existsSync22, readFileSync as readFileSync17, writeFileSync as writeFileSync14 } from "fs";
 import { join as join25 } from "path";
 var configSchema = external_exports.object({
   port: external_exports.number().int().min(1).max(65535).optional(),
@@ -27132,11 +27242,21 @@ function loadConfig(dataDir) {
   }
 }
 function saveConfig(dataDir, config) {
-  writeFileSync13(join25(dataDir, "config.json"), JSON.stringify(config, null, 2));
+  writeFileSync14(join25(dataDir, "config.json"), JSON.stringify(config, null, 2));
 }
 
 // ../server/src/lib/logger.ts
 var import_picocolors2 = __toESM(require_picocolors(), 1);
+async function readErrorBody(res) {
+  try {
+    const body = await res.clone().json();
+    const code = typeof body.code === "string" ? body.code : void 0;
+    const message = typeof body.message === "string" ? body.message : void 0;
+    return code || message ? { code, message } : void 0;
+  } catch {
+    return void 0;
+  }
+}
 function loggerMiddleware() {
   return async (c, next) => {
     const start = Date.now();
@@ -27145,14 +27265,23 @@ function loggerMiddleware() {
     const { method } = c.req;
     const path = c.req.path;
     const status = c.res.status;
+    const error = status >= 400 ? await readErrorBody(c.res) : void 0;
     if (process.stdout.isTTY) {
       const col = status >= 400 ? import_picocolors2.default.red : status >= 300 ? import_picocolors2.default.yellow : import_picocolors2.default.green;
+      const errorSuffix = error ? ` ${import_picocolors2.default.red(error.code ?? "ERROR")}${error.message ? import_picocolors2.default.dim(` ${error.message}`) : ""}` : "";
       console.log(
-        `${import_picocolors2.default.dim((/* @__PURE__ */ new Date()).toISOString())} ${import_picocolors2.default.bold(method.padEnd(6))} ${col(String(status))} ${path} ${import_picocolors2.default.dim(`${ms}ms`)}`
+        `${import_picocolors2.default.dim((/* @__PURE__ */ new Date()).toISOString())} ${import_picocolors2.default.bold(method.padEnd(6))} ${col(String(status))} ${path} ${import_picocolors2.default.dim(`${ms}ms`)}${errorSuffix}`
       );
     } else {
       process.stdout.write(
-        `${JSON.stringify({ time: (/* @__PURE__ */ new Date()).toISOString(), method, path, status, ms })}
+        `${JSON.stringify({
+          time: (/* @__PURE__ */ new Date()).toISOString(),
+          method,
+          path,
+          status,
+          ms,
+          ...error ? { error: error.code, errorMessage: error.message } : {}
+        })}
 `
       );
     }
@@ -28151,8 +28280,8 @@ var createAdaptorServer = (options) => {
     overrideGlobalObjects: options.overrideGlobalObjects,
     autoCleanupIncoming: options.autoCleanupIncoming
   });
-  const createServer = options.createServer || createServerHTTP;
-  const server = createServer(options.serverOptions || {}, requestListener);
+  const createServer2 = options.createServer || createServerHTTP;
+  const server = createServer2(options.serverOptions || {}, requestListener);
   return server;
 };
 var serve = (options, listeningListener) => {