@phren/cli 0.0.28 → 0.0.33

package/mcp/dist/{mcp-session.js → tools/session.js}

@@ -1,22 +1,23 @@
-import { mcpResponse } from "./mcp-types.js";
+import { mcpResponse } from "./types.js";
 import { z } from "zod";
 import * as fs from "fs";
 import * as path from "path";
 import * as crypto from "crypto";
 import { execFileSync } from "child_process";
-import { debugLog, isMemoryScopeVisible, normalizeMemoryScope } from "./shared.js";
-import { withFileLock } from "./shared-governance.js";
-import { isValidProjectName, errorMessage } from "./utils.js";
-import { runCustomHooks } from "./hooks.js";
-import { readExtractedFacts } from "./mcp-extract-facts.js";
-import { resolveFindingSessionId } from "./finding-context.js";
-import { readTasks } from "./data-tasks.js";
-import { readFindings } from "./data-access.js";
-import { getProjectDirs } from "./shared.js";
-import { getActiveTaskForSession } from "./task-lifecycle.js";
-import { listTaskCheckpoints, writeTaskCheckpoint } from "./session-checkpoints.js";
-import { markImpactEntriesCompletedForSession } from "./finding-impact.js";
-import { atomicWriteJson, debugError, scanSessionFiles } from "./session-utils.js";
+import { debugLog, isMemoryScopeVisible, normalizeMemoryScope } from "../shared.js";
+import { withFileLock } from "../shared/governance.js";
+import { isValidProjectName, errorMessage } from "../utils.js";
+import { runCustomHooks } from "../hooks.js";
+import { readExtractedFacts } from "./extract-facts.js";
+import { resolveFindingSessionId } from "../finding/context.js";
+import { readTasks } from "../data/tasks.js";
+import { readFindings } from "../data/access.js";
+import { getProjectDirs } from "../shared.js";
+import { getActiveTaskForSession } from "../task/lifecycle.js";
+import { listTaskCheckpoints, writeTaskCheckpoint } from "../session/checkpoints.js";
+import { markImpactEntriesCompletedForSession } from "../finding/impact.js";
+import { atomicWriteJson, debugError, scanSessionFiles } from "../session/utils.js";
+import { getRuntimeHealth } from "../governance/policy.js";
 const STALE_SESSION_MS = 24 * 60 * 60 * 1000; // 24 hours
 function collectGitStatusSnapshot(cwd) {
     try {
@@ -165,7 +166,8 @@ function writeLastSummary(phrenPath, summary, sessionId, project) {
         debugError("writeLastSummary", err);
     }
 }
-/** Find the most recent session with a summary (including ended sessions). */
+/** Find the most recent session with a summary (including ended sessions).
+ * @internal Exported for tests. */
 export function findMostRecentSummary(phrenPath) {
     return findMostRecentSummaryWithProject(phrenPath).summary;
 }
@@ -215,6 +217,10 @@ function cleanupStaleSessions(phrenPath) {
     let cleaned = 0;
     for (const { fullPath, data: state } of results) {
         try {
+            // Only clean up sessions that have ended (have endedAt). Active sessions
+            // (no endedAt) should never be removed regardless of age.
+            if (state && !state.endedAt)
+                continue;
             // prefer startedAt from the JSON content over mtime (reliable on noatime mounts)
             const ageMs = state?.startedAt
                 ? Date.now() - new Date(state.startedAt).getTime()
@@ -347,7 +353,7 @@ function hasCompletedTasksInSession(phrenPath, sessionId, project) {
     return artifacts.tasks.some((task) => task.section === "Done" && task.checked);
 }
 /** Compute what changed since the last session ended. */
-export function computeSessionDiff(phrenPath, project, lastSessionEnd) {
+function computeSessionDiff(phrenPath, project, lastSessionEnd) {
     const projectDir = path.join(phrenPath, project);
     const findingsPath = path.join(projectDir, "FINDINGS.md");
     if (!fs.existsSync(findingsPath))
@@ -403,16 +409,15 @@ export function register(server, ctx) {
         if (agentScope !== undefined && !normalizedAgentScope) {
             return mcpResponse({ ok: false, error: `Invalid agentScope: "${agentScope}". Use lowercase letters/numbers with '-' or '_' (max 64 chars).` });
         }
-        // Find most recent prior session for context
+        // Find most recent prior session for context.
+        // When no explicit project is provided, prefer the last ENDED session's
+        // project (completed context) over an active session from a different client.
+        const priorEnded = findMostRecentSummaryWithProject(phrenPath);
         const priorResult = findMostRecentSession(phrenPath);
         const prior = priorResult?.state ?? null;
-        // Also check ended sessions for summaries and project context.
-        // findMostRecentSession skips ended sessions, so we need a separate lookup
-        // to restore project context after a normal session_end.
-        const priorEnded = prior ? null : findMostRecentSummaryWithProject(phrenPath);
-        const priorSummary = prior?.summary ?? priorEnded?.summary ?? null;
-        const priorProject = prior?.project ?? priorEnded?.project;
-        const priorEndedAt = prior?.endedAt ?? priorEnded?.endedAt;
+        const priorSummary = priorEnded?.summary ?? prior?.summary ?? null;
+        const priorProject = priorEnded?.project ?? prior?.project;
+        const priorEndedAt = priorEnded?.endedAt ?? prior?.endedAt;
         // Create new session with unique ID in its own file
         const sessionId = crypto.randomUUID();
         const next = {
@@ -521,10 +526,31 @@ export function register(server, ctx) {
                 debugError("session_start contextDiff", err);
             }
         }
+        // ── Surface sync/health warnings ────────────────────────────────────
+        const sessionWarnings = [];
+        try {
+            const health = getRuntimeHealth(phrenPath);
+            if (health.lastAutoSave?.status === "error") {
+                sessionWarnings.push(`Last auto-save failed: ${health.lastAutoSave.detail ?? "unknown"}`);
+            }
+            if (health.lastSync?.lastPushStatus === "error") {
+                sessionWarnings.push(`Last push failed: ${health.lastSync.lastPushDetail ?? "unknown"}`);
+            }
+            const unsynced = health.lastSync?.unsyncedCommits;
+            if (typeof unsynced === "number" && unsynced > 0) {
+                sessionWarnings.push(`${unsynced} unsynced commit${unsynced === 1 ? "" : "s"} — run 'phren doctor' or check git remote`);
+            }
+        }
+        catch (err) {
+            debugError("session_start runtimeHealth", err);
+        }
+        if (sessionWarnings.length > 0) {
+            parts.push(`## Sync warnings\n${sessionWarnings.map(w => `- ${w}`).join("\n")}`);
+        }
         const message = parts.length > 0
             ? `Session started (${sessionId.slice(0, 8)}).\n\n${parts.join("\n\n")}`
             : `Session started (${sessionId.slice(0, 8)}). No prior context found.`;
-        return mcpResponse({ ok: true, message, data: { sessionId, project: activeProject, agentScope: activeScope } });
+        return mcpResponse({ ok: true, message, data: { sessionId, project: activeProject, agentScope: activeScope, warnings: sessionWarnings.length > 0 ? sessionWarnings : undefined } });
     });
     server.registerTool("session_end", {
         title: "◆ phren · session end",

package/mcp/dist/{mcp-skills.js → tools/skills.js}

@@ -1,11 +1,11 @@
-import { mcpResponse } from "./mcp-types.js";
+import { mcpResponse } from "./types.js";
 import { z } from "zod";
 import * as fs from "fs";
 import * as path from "path";
-import { isValidProjectName, safeProjectPath } from "./utils.js";
-import { parseSkillFrontmatter, validateSkillFrontmatter } from "./link-skills.js";
-import { removeSkillPath, setSkillEnabledAndSync } from "./skill-files.js";
-import { buildSkillManifest, findLocalSkill, findSkill, getAllSkills } from "./skill-registry.js";
+import { isValidProjectName, safeProjectPath } from "../utils.js";
+import { parseSkillFrontmatter, validateSkillFrontmatter } from "../link/skills.js";
+import { removeSkillPath, setSkillEnabledAndSync } from "../skill/files.js";
+import { buildSkillManifest, findLocalSkill, findSkill, getAllSkills } from "../skill/registry.js";
 export function register(server, ctx) {
     const { phrenPath, profile, withWriteQueue, updateFileInIndex } = ctx;
     // ── list_skills ──────────────────────────────────────────────────────────
@@ -80,6 +80,15 @@ export function register(server, ctx) {
         if ("error" in result) {
             return mcpResponse({ ok: false, error: result.error });
         }
+        // Verify skill path doesn't escape phren via symlink
+        try {
+            const realPath = fs.realpathSync(result.path);
+            const phrenReal = fs.realpathSync(phrenPath);
+            if (!realPath.startsWith(phrenReal + path.sep) && !realPath.startsWith(path.dirname(phrenReal) + path.sep)) {
+                return mcpResponse({ ok: false, error: `Skill path resolves outside phren store.` });
+            }
+        }
+        catch { /* path doesn't exist or can't resolve — let readFileSync handle it */ }
         const content = fs.readFileSync(result.path, "utf8");
         const { frontmatter, body } = parseSkillFrontmatter(content);
         const { valid, errors } = validateSkillFrontmatter(content, result.path);
@@ -165,36 +174,34 @@ export function register(server, ctx) {
             return mcpResponse({ ok: true, message: `Removed skill "${name}" (${removedPath}).`, data: { path: removedPath } });
         });
     });
-    for (const action of [
-        { tool: "enable_skill", enabled: true, verb: "Enable" },
-        { tool: "disable_skill", enabled: false, verb: "Disable" },
-    ]) {
-        server.registerTool(action.tool, {
-            title: `◆ phren · ${action.enabled ? "enable" : "disable"} skill`,
-            description: `${action.verb} a skill without deleting its file.`,
-            inputSchema: z.object({
-                name: z.string().describe("Skill name (without .md)."),
-                project: z.string().describe("Project scope or 'global'."),
-            }),
-        }, async ({ name, project }) => {
-            if (project.toLowerCase() !== "global" && !isValidProjectName(project)) {
-                return mcpResponse({ ok: false, error: `Invalid project name: "${project}"` });
-            }
-            const result = findSkill(phrenPath, profile, project, name);
-            if (!result) {
-                return mcpResponse({ ok: false, error: `Skill "${name}" not found in "${project}".` });
-            }
-            if ("error" in result) {
-                return mcpResponse({ ok: false, error: result.error });
-            }
-            return withWriteQueue(async () => {
-                setSkillEnabledAndSync(phrenPath, project, result.name, action.enabled);
-                return mcpResponse({
-                    ok: true,
-                    message: `${action.verb}d skill "${result.name}" in ${project}.`,
-                    data: { name: result.name, project, enabled: action.enabled },
-                });
+    // ── toggle_skill ─────────────────────────────────────────────────────
+    server.registerTool("toggle_skill", {
+        title: "◆ phren · toggle skill",
+        description: "Enable or disable a skill without deleting its file.",
+        inputSchema: z.object({
+            name: z.string().describe("Skill name (without .md)."),
+            enabled: z.boolean().describe("true to enable, false to disable."),
+            project: z.string().describe("Project scope or 'global'."),
+        }),
+    }, async ({ name, enabled, project }) => {
+        if (project.toLowerCase() !== "global" && !isValidProjectName(project)) {
+            return mcpResponse({ ok: false, error: `Invalid project name: "${project}"` });
+        }
+        const result = findSkill(phrenPath, profile, project, name);
+        if (!result) {
+            return mcpResponse({ ok: false, error: `Skill "${name}" not found in "${project}".` });
+        }
+        if ("error" in result) {
+            return mcpResponse({ ok: false, error: result.error });
+        }
+        const verb = enabled ? "Enable" : "Disable";
+        return withWriteQueue(async () => {
+            setSkillEnabledAndSync(phrenPath, project, result.name, enabled);
+            return mcpResponse({
+                ok: true,
+                message: `${verb}d skill "${result.name}" in ${project}.`,
+                data: { name: result.name, project, enabled },
             });
         });
-    }
+    });
 }