@pentoshi/clai 3.5.1 → 3.6.0

package/dist/agent/project-root.js

@@ -0,0 +1,158 @@
+import { isAbsolute, join, resolve } from "node:path";
+import { existsSync } from "node:fs";
+import { homedir } from "node:os";
+import { safeCwd } from "../os/cwd.js";
+import { isBareParentDirectory, isExistingProjectDir, resolveScaffoldTargetPath, } from "./workspace-orient.js";
+/**
+ * Sticky project root for the active plan/session turn.
+ * Relative fs paths and bare shell cwd resolve here so the agent never
+ * rewrites the agent package while working in a user project elsewhere.
+ */
+let activeProjectRoot;
+export function setActiveProjectRoot(root) {
+    if (!root?.trim()) {
+        activeProjectRoot = undefined;
+        return;
+    }
+    const resolved = resolve(root.trim());
+    // Never pin sticky root to a bare parent (Desktop/home) — that makes
+    // relative "src/…" land on Desktop/src instead of the real project.
+    if (isBareParentDirectory(resolved)) {
+        return;
+    }
+    activeProjectRoot = resolved;
+}
+/**
+ * Pin root only when the path exists (or force=true after a successful scaffold).
+ * Prevents inventing Desktop/todo-app before the folder is real.
+ */
+export function setActiveProjectRootIfValid(root, opts) {
+    if (!root?.trim())
+        return false;
+    const resolved = resolve(root.trim());
+    if (isBareParentDirectory(resolved))
+        return false;
+    if (!opts?.force && !existsSync(resolved))
+        return false;
+    activeProjectRoot = resolved;
+    return true;
+}
+export function getActiveProjectRoot() {
+    return activeProjectRoot;
+}
+export function clearActiveProjectRoot() {
+    activeProjectRoot = undefined;
+}
+/** Absolute POSIX/mac paths under the user tree that look like project dirs. */
+const ABS_PROJECT_RE = /(?:^|[\s"'`=])(\/(?:Users|home)\/[^\s"'`:]+?(?:\/(?:Desktop|Documents|Projects|dev|code|src|work|repos?)\/[^\s"'`:]+|\/[^\s"'`:]*todo[^\s"'`/]*))(?=[\s"'`]|$)/gi;
+/**
+ * Pull the best project directory from plan text / user prompt.
+ * Prefers existing paths; never returns bare Desktop alone when a deeper path exists.
+ */
+export function extractProjectRootFromText(...parts) {
+    const blob = parts.filter(Boolean).join("\n");
+    if (!blob.trim())
+        return undefined;
+    const candidates = [];
+    let m;
+    const re = new RegExp(ABS_PROJECT_RE.source, ABS_PROJECT_RE.flags);
+    while ((m = re.exec(blob)) !== null) {
+        const p = m[1].replace(/\/+$/, "");
+        candidates.push(p);
+    }
+    // Relative "…/Desktop/todo-app" without leading path — join home
+    const relDesk = blob.match(/(?:^|[\s"'`])(?:~\/Desktop|Desktop)\/([A-Za-z0-9._-]+)/);
+    if (relDesk?.[1]) {
+        candidates.push(join(homedir(), "Desktop", relDesk[1]));
+    }
+    if (candidates.length === 0)
+        return undefined;
+    // Prefer deepest path (project folder over Desktop alone)
+    candidates.sort((a, b) => b.length - a.length);
+    // Prefer candidates that already exist on disk
+    const existing = candidates.filter((c) => existsSync(resolve(c)));
+    const pool = existing.length > 0 ? existing : candidates;
+    for (const c of pool) {
+        const resolved = resolve(c);
+        if (isBareParentDirectory(resolved) && pool.some((x) => x.length > c.length)) {
+            continue;
+        }
+        if (isBareParentDirectory(resolved))
+            continue;
+        return resolved;
+    }
+    return undefined;
+}
+export function extractProjectRootFromPlan(plan) {
+    if (!plan)
+        return undefined;
+    return extractProjectRootFromText(plan.goal, plan.detail, ...plan.tasks.map((t) => t.title));
+}
+/**
+ * After a successful one-shot scaffolder, derive the project directory.
+ * Stack-agnostic: npm create, cargo new, rails new, poetry new, etc.
+ */
+export function extractProjectRootFromScaffold(command, shellCwd) {
+    return resolveScaffoldTargetPath(command, shellCwd);
+}
+/**
+ * Resolve a tool path: absolute stays absolute; relative uses active project
+ * root when set, else process cwd.
+ */
+export function resolveToolPath(path) {
+    const trimmed = path.trim();
+    if (!trimmed)
+        return resolve(safeCwd(), ".");
+    let expanded = trimmed;
+    if (expanded === "~")
+        expanded = homedir();
+    else if (expanded.startsWith("~/") || expanded.startsWith("~\\")) {
+        expanded = join(homedir(), expanded.slice(2));
+    }
+    if (isAbsolute(expanded)) {
+        return resolve(expanded);
+    }
+    const root = getActiveProjectRoot();
+    if (root) {
+        return resolve(root, expanded);
+    }
+    return resolve(safeCwd(), expanded);
+}
+/**
+ * If the model wrote into the agent package while a project root is set
+ * elsewhere, remap onto the project (keeps relative subpath).
+ * Generic: any relative path or common source roots (src, lib, app, …).
+ */
+export function remapAgentCwdWrite(resolved, original) {
+    const root = getActiveProjectRoot();
+    if (!root)
+        return resolved;
+    const agent = safeCwd();
+    if (root === agent)
+        return resolved;
+    // Already under project
+    if (resolved === root ||
+        resolved.startsWith(root + "/") ||
+        resolved.startsWith(root + "\\")) {
+        return resolved;
+    }
+    // Relative original wrongly resolved into agent cwd
+    if (!isAbsolute(original.trim()) &&
+        (resolved.startsWith(agent + "/") || resolved.startsWith(agent + "\\"))) {
+        const rel = resolved.slice(agent.length).replace(/^[/\\]/, "");
+        return resolve(root, rel);
+    }
+    // Absolute path under agent that looks like app source
+    if ((resolved.startsWith(agent + "/") || resolved.startsWith(agent + "\\")) &&
+        existsSync(root) &&
+        isExistingProjectDir(root)) {
+        const rel = resolved.slice(agent.length).replace(/^[/\\]+/, "");
+        // Common project-relative source trees (language-agnostic)
+        if (/^(src|lib|app|apps|packages|cmd|internal|pkg|tests?|spec|public|static|assets|components|pages|routes|handlers|models|views)[/\\]/i.test(rel) ||
+            /\.(jsx?|tsx?|vue|svelte|py|go|rs|java|kt|rb|php|swift|cs)$/i.test(rel)) {
+            return resolve(root, rel);
+        }
+    }
+    return resolved;
+}
+//# sourceMappingURL=project-root.js.map

package/dist/agent/project-root.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"project-root.js","sourceRoot":"","sources":["../../src/agent/project-root.ts"],"names":[],"mappings":"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"}