npm - dorkos - Versions diffs - 0.28.0 → 0.30.0 - Mend

dorkos 0.28.0 → 0.30.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (14) hide show

package/README.md +35 -10
package/dist/bin/cli.js +195 -26
package/dist/client/assets/{TopologyGraph-BaiZveMC.js → TopologyGraph-CuQTi5Uc.js} +1 -1
package/dist/client/assets/{highlighted-body-TPN3WLV5-BUQbhdip.js → highlighted-body-TPN3WLV5-B0wsKIKb.js} +1 -1
package/dist/client/assets/{index-DxBk4h1v.js → index-BgKkAwVN.js} +1 -1
package/dist/client/assets/index-BjpAuMmK.css +1 -0
package/dist/client/assets/{index-CNUb7Lio.js → index-BrU_YWM3.js} +1 -1
package/dist/client/assets/index-PgrCLMKB.js +1129 -0
package/dist/client/index.html +2 -2
package/dist/server/index.js +101 -30
package/dist/server/index.js.map +2 -2
package/package.json +2 -2
package/dist/client/assets/index-BwRA7wsa.css +0 -1
package/dist/client/assets/index-CdnIpAgi.js +0 -1118

package/dist/client/index.html CHANGED Viewed

@@ -15,8 +15,8 @@
         if (dark) document.documentElement.classList.add('dark');
       })();
     </script>
-    <script type="module" crossorigin src="/assets/index-CdnIpAgi.js"></script>
-    <link rel="stylesheet" crossorigin href="/assets/index-BwRA7wsa.css">
+    <script type="module" crossorigin src="/assets/index-PgrCLMKB.js"></script>
+    <link rel="stylesheet" crossorigin href="/assets/index-BjpAuMmK.css">
   </head>
   <body>
     <div id="root"></div>

package/dist/server/index.js CHANGED Viewed

@@ -26197,8 +26197,9 @@ async function execGitClone(url, target, auth, onProgress) {
         onProgress(parseInt(resolvingMatch[1], 10), "resolving");
       }
     });
-    proc2.on("error", (err) => reject(err));
-    proc2.on("close", async (code4) => {
+    const procEvents = proc2;
+    procEvents.on("error", (err) => reject(err));
+    procEvents.on("close", async (code4) => {
       if (code4 !== 0) {
         reject(new Error(`git clone exited with code ${code4}: ${redactAuthTokens(stderr)}`));
         return;
@@ -82089,18 +82090,24 @@ function getBoundary() {
   }
   return resolvedBoundary;
 }
+function expandTilde(userPath) {
+  if (userPath === "~") return os.homedir();
+  if (userPath.startsWith("~/")) return path.join(os.homedir(), userPath.slice(2));
+  return userPath;
+}
 async function validateBoundary(userPath, boundary) {
   const root3 = boundary ?? getBoundary();
   if (userPath.includes("\0")) {
     throw new BoundaryError("Invalid path: null bytes not allowed", "NULL_BYTE");
   }
+  const expanded = expandTilde(userPath);
   let resolved;
   try {
-    resolved = await fs.realpath(userPath);
+    resolved = await fs.realpath(expanded);
   } catch (err) {
     const code4 = err.code;
     if (code4 === "ENOENT") {
-      resolved = path.resolve(userPath);
+      resolved = path.resolve(expanded);
     } else if (code4 === "EACCES") {
       throw new BoundaryError("Permission denied", "PERMISSION_DENIED");
     } else {
@@ -82637,8 +82644,9 @@ var UserConfigSchema = z5.object({
   server: z5.object({
     port: z5.number().int().min(1024).max(65535).default(4242),
     cwd: z5.string().nullable().default(null),
-    boundary: z5.string().nullable().default(null)
-  }).default(() => ({ port: 4242, cwd: null, boundary: null })),
+    boundary: z5.string().nullable().default(null),
+    open: z5.boolean().default(true)
+  }).default(() => ({ port: 4242, cwd: null, boundary: null, open: true })),
   tunnel: z5.object({
     enabled: z5.boolean().default(false),
     domain: z5.string().nullable().default(null),
@@ -82915,7 +82923,7 @@ var SERVER_VERSION = resolveVersion();
 var IS_DEV_BUILD = checkDevBuild(SERVER_VERSION);
 function resolveVersion() {
   if (env.DORKOS_VERSION_OVERRIDE) return env.DORKOS_VERSION_OVERRIDE;
-  if (true) return "0.28.0";
+  if (true) return "0.30.0";
   const pkgPath = path5.join(path5.dirname(fileURLToPath2(import.meta.url)), "../../package.json");
   return JSON.parse(readFileSync(pkgPath, "utf-8")).version;
 }
@@ -93523,7 +93531,6 @@ function dorkbotClaudeMdTemplate() {
 // ../../apps/server/src/services/core/agent-creator.ts
 init_logger();
-init_env();
 var AgentCreationError = class extends Error {
   constructor(message, code4, statusCode = 400) {
     super(message);
@@ -93547,7 +93554,7 @@ async function maybeSetDefaultAgent(agentName) {
     const agentsConfig = configManager.get("agents");
     const currentDefault = agentsConfig.defaultAgent;
     const defaultAgentDir = path19.resolve(
-      agentsConfig.defaultDirectory.replace(/^~/, env.HOME || ""),
+      expandTilde(agentsConfig.defaultDirectory),
       currentDefault
     );
     await fs13.stat(path19.join(defaultAgentDir, ".dork", "agent.json"));
@@ -93569,7 +93576,7 @@ async function createAgentWorkspace(input, meshCore2) {
   }
   const opts = parseResult.data;
   const agentsConfig = configManager.get("agents");
-  const resolvedPath = opts.directory ? path19.resolve(opts.directory) : path19.resolve(agentsConfig.defaultDirectory.replace(/^~/, env.HOME || ""), opts.name);
+  const resolvedPath = opts.directory ? path19.resolve(opts.directory) : path19.resolve(expandTilde(agentsConfig.defaultDirectory), opts.name);
   try {
     await validateBoundary(resolvedPath);
   } catch (err) {
@@ -130463,6 +130470,13 @@ async function* unifiedScan(options, strategies, registry2, denialList) {
   const followSymlinks = options.followSymlinks ?? false;
   const extraExcludes = new Set(options.extraExcludes ?? []);
   const { logger: logger3 } = options;
+  logger3?.info("[mesh] unified-scanner: starting", {
+    root: options.root,
+    maxDepth,
+    timeoutMs,
+    followSymlinks,
+    strategyCount: strategies.length
+  });
   const progress = { scannedDirs: 0, foundAgents: 0 };
   let timedOut = false;
   const timer = setTimeout(() => {
@@ -130473,6 +130487,7 @@ async function* unifiedScan(options, strategies, registry2, denialList) {
   try {
     while (queue2.length > 0) {
       if (timedOut) {
+        logger3?.info("[mesh] unified-scanner: timed out", progress);
         yield { type: "complete", data: { ...progress, timedOut: true } };
         return;
       }
@@ -130553,6 +130568,7 @@ async function* unifiedScan(options, strategies, registry2, denialList) {
         }
       }
     }
+    logger3?.info("[mesh] unified-scanner: finished", progress);
     yield { type: "complete", data: { ...progress, timedOut: false } };
   } finally {
     clearTimeout(timer);
@@ -131326,13 +131342,14 @@ function createMeshRouter(deps) {
     if (!result2.success) {
       return res.status(400).json({ error: "Validation failed", details: result2.error.flatten() });
     }
+    let resolvedPath;
     try {
-      await validateBoundary(result2.data.path);
+      resolvedPath = await validateBoundary(result2.data.path);
     } catch {
       return res.status(403).json({ error: `Path outside boundary: ${result2.data.path}` });
     }
     try {
-      await meshCore2.deny(result2.data.path, result2.data.reason, result2.data.denier);
+      await meshCore2.deny(resolvedPath, result2.data.reason, result2.data.denier);
       return res.status(201).json({ success: true });
     } catch (err) {
       const message = err instanceof Error ? err.message : "Denial failed";
@@ -131348,12 +131365,13 @@ function createMeshRouter(deps) {
     if (filePath.includes("..") || filePath.includes("\0")) {
       return res.status(400).json({ error: "Invalid path" });
     }
+    let resolvedPath;
     try {
-      await validateBoundary(filePath);
+      resolvedPath = await validateBoundary(filePath);
     } catch {
       return res.status(403).json({ error: `Path outside boundary: ${filePath}` });
     }
-    await meshCore2.undeny(filePath);
+    await meshCore2.undeny(resolvedPath);
     return res.json({ success: true });
   });
   return router15;
@@ -133186,11 +133204,11 @@ function createAgentsRouter(meshCore2) {
   const router15 = Router22();
   router15.get("/current", async (req, res) => {
     try {
-      const agentPath = req.query.path;
-      if (!agentPath) {
+      const rawPath = req.query.path;
+      if (!rawPath) {
         return res.status(400).json({ error: "path query parameter required" });
       }
-      await validateBoundary(agentPath);
+      const agentPath = await validateBoundary(rawPath);
       const manifest = await readManifest(agentPath);
       if (!manifest) {
         return res.status(404).json({ error: "No agent registered at this path" });
@@ -133216,8 +133234,8 @@ function createAgentsRouter(meshCore2) {
       await Promise.all(
         result2.data.paths.map(async (p4) => {
           try {
-            await validateBoundary(p4);
-            agents2[p4] = await readManifest(p4);
+            const resolvedP = await validateBoundary(p4);
+            agents2[p4] = await readManifest(resolvedP);
           } catch {
             agents2[p4] = null;
           }
@@ -133235,8 +133253,8 @@ function createAgentsRouter(meshCore2) {
       if (!result2.success) {
         return res.status(400).json({ error: "Validation failed", details: result2.error.flatten() });
       }
-      const { path: agentPath, name: name2, description, runtime } = result2.data;
-      await validateBoundary(agentPath);
+      const { path: rawAgentPath, name: name2, description, runtime } = result2.data;
+      const agentPath = await validateBoundary(rawAgentPath);
       const existing = await readManifest(agentPath);
       if (existing) {
         return res.status(409).json({ error: "Agent already exists at this path", agent: existing });
@@ -133325,11 +133343,11 @@ function createAgentsRouter(meshCore2) {
   });
   router15.patch("/current", async (req, res) => {
     try {
-      const agentPath = req.query.path;
-      if (!agentPath) {
+      const rawPath = req.query.path;
+      if (!rawPath) {
         return res.status(400).json({ error: "path query parameter required" });
       }
-      await validateBoundary(agentPath);
+      const agentPath = await validateBoundary(rawPath);
       const result2 = UpdateAgentRequestSchema.safeParse(req.body);
       if (!result2.success) {
         return res.status(400).json({ error: "Validation failed", details: result2.error.flatten() });
@@ -133372,11 +133390,11 @@ function createAgentsRouter(meshCore2) {
   });
   router15.post("/current/migrate-persona", async (req, res) => {
     try {
-      const agentPath = req.query.path;
-      if (!agentPath) {
+      const rawPath = req.query.path;
+      if (!rawPath) {
         return res.status(400).json({ error: "path query parameter required" });
       }
-      await validateBoundary(agentPath);
+      const agentPath = await validateBoundary(rawPath);
       const manifest = await readManifest(agentPath);
       if (!manifest) {
         return res.status(404).json({ error: "No agent registered at this path" });
@@ -133412,6 +133430,7 @@ function createAgentsRouter(meshCore2) {
 // ../../apps/server/src/routes/discovery.ts
 import { Router as Router23 } from "express";
 import { z as z33 } from "zod";
+init_logger();
 var ScanRequestSchema = z33.object({
   root: z33.string().optional(),
   roots: z33.array(z33.string()).optional(),
@@ -133424,9 +133443,15 @@ function createDiscoveryRouter(meshCore2) {
     const data = parseBody(ScanRequestSchema, req.body, res);
     if (!data) return;
     const roots = data.roots && data.roots.length > 0 ? data.roots : data.root ? [data.root] : [getBoundary()];
+    logger.info("[Discovery] Scan starting", {
+      roots,
+      maxDepth: data.maxDepth ?? 5,
+      timeout: data.timeout ?? 3e4
+    });
     for (const root3 of roots) {
       const withinBoundary = await isWithinBoundary(root3);
       if (!withinBoundary) {
+        logger.warn("[Discovery] Root rejected \u2014 outside boundary", { root: root3 });
         return res.status(403).json({ error: `Root path outside directory boundary` });
       }
     }
@@ -133436,13 +133461,42 @@ function createDiscoveryRouter(meshCore2) {
       Connection: "keep-alive",
       "X-Accel-Buffering": "no"
     });
+    const startMs = Date.now();
+    let candidateCount = 0;
+    let autoImportCount = 0;
     try {
       for await (const event of meshCore2.discover(roots, {
         maxDepth: data.maxDepth,
         timeout: data.timeout
       })) {
         if (res.writableEnded) break;
-        if (event.type === "auto-import") continue;
+        if (event.type === "auto-import") {
+          autoImportCount++;
+          const { manifest, path: agentPath } = event.data;
+          const existing = {
+            path: agentPath,
+            name: manifest.name,
+            runtime: manifest.runtime,
+            description: manifest.description ?? ""
+          };
+          logger.debug("[Discovery] Auto-imported agent surfaced as existing-agent", {
+            path: agentPath,
+            name: manifest.name
+          });
+          res.write(`event: existing-agent
+`);
+          res.write(`data: ${JSON.stringify(existing)}
+`);
+          continue;
+        }
+        if (event.type === "candidate") {
+          candidateCount++;
+          logger.debug("[Discovery] Candidate found", {
+            path: event.data.path,
+            strategy: event.data.strategy
+          });
+        }
         res.write(`event: ${event.type}
 `);
         res.write(`data: ${JSON.stringify(event.data)}
@@ -133450,8 +133504,9 @@ function createDiscoveryRouter(meshCore2) {
 `);
       }
     } catch (err) {
+      const message = err instanceof Error ? err.message : "Scan failed";
+      logger.error("[Discovery] Scan error", { error: message });
       if (!res.writableEnded) {
-        const message = err instanceof Error ? err.message : "Scan failed";
         res.write(`event: error
 `);
         res.write(`data: ${JSON.stringify({ error: message })}
@@ -133459,6 +133514,13 @@ function createDiscoveryRouter(meshCore2) {
 `);
       }
     } finally {
+      const elapsedMs = Date.now() - startMs;
+      logger.info("[Discovery] Scan complete", {
+        elapsedMs,
+        candidateCount,
+        autoImportCount,
+        roots
+      });
       if (!res.writableEnded) {
         res.end();
       }
@@ -143011,7 +143073,7 @@ async function start() {
     runtimeRegistry.getDefault().setRelay?.(relayCore);
   }
   const host = env.DORKOS_HOST;
-  app.listen(PORT, host, () => {
+  const server = app.listen(PORT, host, () => {
     logger.info(`DorkOS server running on http://${host}:${PORT}`);
     activityService.emit({
       actorType: "system",
@@ -143021,6 +143083,15 @@ async function start() {
       summary: "DorkOS started"
     });
   });
+  server.on("error", (err) => {
+    if (err.code === "EADDRINUSE") {
+      logger.error(
+        `Port ${PORT} is already in use. Run \`lsof -i :${PORT}\` to find the process, or start with \`--port ${PORT + 1}\`.`
+      );
+      process.exit(1);
+    }
+    throw err;
+  });
   if (schedulerService) {
     await schedulerService.start();
     logger.info("[Tasks] Scheduler started");