@jterrats/open-orchestra 0.4.1 → 0.4.2-beta.2

package/dist/skills.js

@@ -1,12 +1,41 @@
+import { createHash, randomUUID } from "node:crypto";
 import { readFile, writeFile } from "node:fs/promises";
 import { dirname } from "node:path";
 import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { FILES } from "./constants.js";
 import { exists, readJson, resolveWorkflowPath, writeJson, } from "./fs-utils.js";
+import { queryMemory, recordMemoryEvent, renderMemoryPacket, } from "./memory.js";
 import { appendEvent, loadWorkspace, writeArtifact } from "./workspace.js";
 const PACKAGE_ROOT = dirname(dirname(fileURLToPath(import.meta.url)));
 const defaultSkills = [
+    {
+        id: "proactive-orchestra",
+        name: "Proactive Orchestra",
+        summary: "Self-bootstrap Open Orchestra workflow checks before implementation and record accepted bypasses.",
+        triggers: [
+            "orchestra",
+            "workflow",
+            "task loop",
+            "bootstrap",
+            "pre-run",
+            "handoff",
+            "evidence",
+        ],
+        roles: ["parent", "architect", "developer", "qa", "release_manager"],
+        capabilities: ["workflow-discipline", "pre-run-validation", "auditability"],
+        riskAreas: ["governance", "quality"],
+        sourceGroups: ["project-instructions", "agent-memory"],
+        entry: "skills/proactive-orchestra/SKILL.md",
+        assets: [],
+        evidence: ["command", "report", "file"],
+        loadBudget: "small",
+        instructions: [
+            "Start with health and task list before implementation when .agent-workflow exists.",
+            "Run pre-run validation before coding and resolve missing estimate, workflow, evidence, or review checks.",
+            "Record user-accepted deviations as decisions instead of silently skipping workflow steps.",
+        ],
+    },
     {
         id: "prompt-registry",
         name: "Prompt Registry",
@@ -401,12 +430,23 @@ export async function planSkillsForTask(taskId, root = process.cwd()) {
 export async function renderSkills({ target, taskId, skillIds, root = process.cwd(), }) {
     const skills = await resolveRenderSkills({ taskId, skillIds, root });
     const sourceGroups = unique(skills.flatMap((skill) => skill.sourceGroups));
+    const memoryQuery = skillIds?.join(" ");
+    const memory = await queryMemory({
+        ...(taskId ? { taskId } : {}),
+        hook: "before_implementation",
+        ...(memoryQuery ? { query: memoryQuery } : {}),
+        root,
+    });
+    if (taskId) {
+        await recordMemoryEvent(root, memory, "MEMORY_QUERIED");
+    }
     return {
         target,
         taskId,
         skills,
         sourceGroups,
-        content: renderForTarget(target, skills, sourceGroups, taskId),
+        memory,
+        content: renderForTarget(target, skills, sourceGroups, taskId, memory),
     };
 }
 async function resolveRenderSkills({ taskId, skillIds, root, }) {
@@ -482,25 +522,25 @@ function taskText(task) {
         .join(" ")
         .toLowerCase();
 }
-function renderForTarget(target, skills, sourceGroups, taskId) {
+function renderForTarget(target, skills, sourceGroups, taskId, memory) {
     if (target === "cursor") {
-        return renderMarkdown(skills, sourceGroups, taskId, "Cursor Skill Context", "Use these Open Orchestra skills as task-scoped Cursor rules.");
+        return renderMarkdown(skills, sourceGroups, taskId, "Cursor Skill Context", "Use these Open Orchestra skills as task-scoped Cursor rules.", memory);
     }
     if (target === "windsurf") {
-        return renderMarkdown(skills, sourceGroups, taskId, "Windsurf Skill Context", "Use these Open Orchestra skills as task-scoped Windsurf rules.");
+        return renderMarkdown(skills, sourceGroups, taskId, "Windsurf Skill Context", "Use these Open Orchestra skills as task-scoped Windsurf rules.", memory);
     }
     if (target === "claude") {
-        return renderMarkdown(skills, sourceGroups, taskId, "Claude Skill Context", "Load only these Open Orchestra skills for this task.");
+        return renderMarkdown(skills, sourceGroups, taskId, "Claude Skill Context", "Load only these Open Orchestra skills for this task.", memory);
     }
     if (target === "codex") {
-        return renderMarkdown(skills, sourceGroups, taskId, "Codex Skill Context", "Apply these Open Orchestra skills while preserving AGENTS.md instructions.");
+        return renderMarkdown(skills, sourceGroups, taskId, "Codex Skill Context", "Apply these Open Orchestra skills while preserving AGENTS.md instructions.", memory);
     }
     if (target === "vscode") {
-        return JSON.stringify({ taskId, sourceGroups, skills }, null, 2);
+        return JSON.stringify({ taskId, sourceGroups, skills, memory }, null, 2);
     }
-    return renderMarkdown(skills, sourceGroups, taskId, "Open Orchestra Skill Context", "Provider-agnostic skill context for this task.");
+    return renderMarkdown(skills, sourceGroups, taskId, "Open Orchestra Skill Context", "Provider-agnostic skill context for this task.", memory);
 }
-function renderMarkdown(skills, sourceGroups, taskId, title, intro) {
+function renderMarkdown(skills, sourceGroups, taskId, title, intro, memory) {
     const lines = [
         `# ${title}`,
         "",
@@ -512,6 +552,7 @@ function renderMarkdown(skills, sourceGroups, taskId, title, intro) {
         "",
         ...sourceGroups.map((group) => `- ${group}`),
         "",
+        ...(memory ? [renderMemoryPacket(memory), ""] : []),
     ];
     for (const skill of skills) {
         lines.push(`## ${skill.name}`, "", `ID: ${skill.id}`, "", skill.summary, "", "### Load From", "", `- ${skill.entry}`, "", "### Procedure", "", ...skill.instructions.map((instruction) => `- ${instruction}`), "", "### Evidence", "", ...skill.evidence.map((evidence) => `- ${evidence}`), "");
@@ -589,6 +630,9 @@ export async function recordSkillPlan(plan, root = process.cwd()) {
     });
 }
 export async function recordSkillRender(rendered, root = process.cwd()) {
+    if (!rendered.taskId) {
+        return;
+    }
     if (!(await hasInitializedWorkflowState(root))) {
         return;
     }
@@ -601,6 +645,13 @@ export async function recordSkillRender(rendered, root = process.cwd()) {
             target: rendered.target,
             selectedSkillIds: rendered.skills.map((skill) => skill.id),
             sourceGroups: rendered.sourceGroups,
+            memory: rendered.memory &&
+                removeUndefined({
+                    hook: rendered.memory.hook,
+                    estimatedTokens: rendered.memory.estimatedTokens,
+                    lessonCount: rendered.memory.lessons.length,
+                    promptCount: rendered.memory.prompts.length,
+                }),
         },
     }));
 }
@@ -608,7 +659,11 @@ async function hasInitializedWorkflowState(root) {
     return exists(resolveWorkflowPath(root, FILES.config));
 }
 export async function addAgentLesson(input, root = process.cwd()) {
-    const lesson = { timestamp: new Date().toISOString(), ...input };
+    const lesson = {
+        id: `lesson-${randomUUID()}`,
+        timestamp: new Date().toISOString(),
+        ...input,
+    };
     await writeFile(resolveWorkflowPath(root, FILES.agentLessons), `${JSON.stringify(lesson)}\n`, { flag: "a" });
     await appendEvent(root, removeUndefined({
         type: "LESSON_RECORDED",
@@ -621,7 +676,38 @@ export async function addAgentLesson(input, root = process.cwd()) {
 }
 export async function listAgentLessons(root = process.cwd()) {
     const lines = await readAgentLessons(root);
-    return lines.map((line) => JSON.parse(line));
+    return lines.map((line) => normalizeAgentLesson(JSON.parse(line)));
+}
+export async function deleteAgentLesson(id, root = process.cwd()) {
+    const lines = await readAgentLessons(root);
+    let deletedLesson;
+    const retained = [];
+    for (const line of lines) {
+        const parsed = JSON.parse(line);
+        const lesson = normalizeAgentLesson(parsed);
+        if (lesson.id === id) {
+            deletedLesson = lesson;
+        }
+        else {
+            retained.push(JSON.stringify(parsed));
+        }
+    }
+    if (!deletedLesson) {
+        throw new Error(`lesson not found: ${id}`);
+    }
+    await writeFile(resolveWorkflowPath(root, FILES.agentLessons), retained.length > 0 ? `${retained.join("\n")}\n` : "", "utf8");
+    await appendEvent(root, removeUndefined({
+        type: "LESSON_DELETED",
+        taskId: deletedLesson.taskId,
+        actor: "parent",
+        summary: `Deleted lesson ${id}`,
+        metadata: {
+            lessonId: id,
+            operation: deletedLesson.operation,
+            errorSignature: deletedLesson.errorSignature,
+        },
+    }));
+    return { deleted: true, id };
 }
 export async function promoteAgentLessons({ to, filter, root = process.cwd(), }) {
     const lessons = (await listAgentLessons(root)).filter((lesson) => {
@@ -653,6 +739,29 @@ export async function promoteAgentLessons({ to, filter, root = process.cwd(), })
     });
     return { artifact, lessons };
 }
+function normalizeAgentLesson(value) {
+    const lesson = value;
+    return {
+        ...lesson,
+        id: lesson.id ?? legacyLessonId(lesson),
+    };
+}
+function legacyLessonId(lesson) {
+    const stablePayload = JSON.stringify({
+        timestamp: lesson.timestamp,
+        actor: lesson.actor,
+        operation: lesson.operation,
+        failedAction: lesson.failedAction,
+        errorSignature: lesson.errorSignature,
+        rootCause: lesson.rootCause,
+        fix: lesson.fix,
+        prevention: lesson.prevention,
+        appliesTo: lesson.appliesTo,
+        verifiedBy: lesson.verifiedBy,
+        taskId: lesson.taskId,
+    });
+    return `legacy-${createHash("sha256").update(stablePayload).digest("hex").slice(0, 16)}`;
+}
 export async function writeSourceOfTruth(entries, root = process.cwd()) {
     await writeJson(path.join(root, ".agent-workflow", FILES.sourceOfTruth), entries);
 }

package/dist/skills.js.map

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

package/dist/subagent-protocol.js

@@ -150,6 +150,12 @@ function renderProtocolMarkdown(protocol, target) {
         "## Task Routing",
         ...protocol.taskRoutes.map((route) => `- ${route.taskId}: ${route.routeRole} (${route.status}, dependencies ${route.dependencyState})`),
         "",
+        "## Proactive Workflow Guardrails",
+        "- Start sessions with `orchestra health --json` and `orchestra task list --json`.",
+        "- Resume an existing pending, blocked, or in-progress task before creating a new one.",
+        "- Run `orchestra validate --pre-run --task <ID> --json` before implementation.",
+        '- Record accepted deviations with `orchestra validate --pre-run --task <ID> --bypass --bypass-rationale "..."`.',
+        "",
         "## Conflict Precedence",
         ...protocol.conflictPrecedence.map((item) => `- ${item}`),
         "",

package/dist/subagent-protocol.js.map

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

package/dist/tool-commands.d.ts

@@ -1,3 +1,5 @@
 import type { CliIo, CliOptions } from "./types.js";
 export declare function diagramsLintCommand(options: CliOptions, io: CliIo): Promise<void>;
 export declare function mcpOAuthProxyEvaluateCommand(options: CliOptions, io: CliIo): Promise<void>;
+export declare function mcpOAuthProxyStartCommand(options: CliOptions, io: CliIo): Promise<void>;
+export declare function mcpOAuthProxyTokenCommand(action: string | undefined, options: CliOptions, io: CliIo): Promise<void>;

package/dist/tool-commands.js

@@ -1,7 +1,8 @@
+import { readFile } from "node:fs/promises";
 import { requireArg } from "./args.js";
-import { removeUndefined, stringOption } from "./command-utils.js";
+import { parseCsv, removeUndefined, stringOption } from "./command-utils.js";
 import { lintMermaidDiagram, recordDiagramLintEvidence, } from "./diagram-validation.js";
-import { evaluateMcpOAuthProxy, } from "./mcp-oauth-proxy.js";
+import { clearMcpToken, evaluateMcpOAuthProxy, forceRefreshMcpToken, readMcpTokenStatus, startMcpOAuthProxy, } from "./mcp-oauth-proxy.js";
 export async function diagramsLintCommand(options, io) {
     const result = await lintMermaidDiagram({
         filePath: requireArg(options, "file"),
@@ -30,17 +31,7 @@ export async function diagramsLintCommand(options, io) {
     }
 }
 export async function mcpOAuthProxyEvaluateCommand(options, io) {
-    const evaluation = evaluateMcpOAuthProxy(removeUndefined({
-        enabled: Boolean(options.enable),
-        mode: parseMcpProxyMode(stringOption(options.mode) ?? "stdio-proxy"),
-        serverUrl: requireArg(options, "server-url"),
-        tokenStorage: parseMcpSecretStorage(stringOption(options["token-storage"]) ?? "keychain"),
-        tokenPath: stringOption(options["token-path"]),
-        refreshWindowSeconds: Number(stringOption(options["refresh-window"]) ?? 300),
-        approvedBy: options.approve
-            ? (stringOption(options.approver) ?? "local-user")
-            : undefined,
-    }));
+    const evaluation = evaluateMcpOAuthProxy(await mcpConfigFromOptions(options));
     if (options.json) {
         io.log(JSON.stringify(evaluation, null, 2));
         return;
@@ -52,6 +43,115 @@ export async function mcpOAuthProxyEvaluateCommand(options, io) {
         io.log("RISK: " + risk);
     }
 }
+export async function mcpOAuthProxyStartCommand(options, io) {
+    const result = await startMcpOAuthProxy({
+        config: await mcpConfigFromOptions(options),
+        openBrowser: !options["no-open"],
+    });
+    if (options.json) {
+        io.log(JSON.stringify(result, null, 2));
+        return;
+    }
+    io.log(result.proxyReady ? "MCP OAuth stdio proxy ready" : "MCP OAuth token ready");
+    io.log("Token expires at " + result.token.expiresAt);
+}
+export async function mcpOAuthProxyTokenCommand(action, options, io) {
+    const config = await mcpConfigFromOptions(options);
+    if (action === "status") {
+        const status = await readMcpTokenStatus(config);
+        if (options.json) {
+            io.log(JSON.stringify(status, null, 2));
+            return;
+        }
+        io.log(status.exists ? "MCP OAuth token present" : "MCP OAuth token missing");
+        if (status.expiresAt) {
+            io.log("Expires at " + status.expiresAt);
+        }
+        if (status.needsRefresh) {
+            io.log("Refresh recommended before use");
+        }
+        return;
+    }
+    if (action === "refresh") {
+        const refreshed = await forceRefreshMcpToken({ config });
+        const output = removeUndefined({
+            refreshed: refreshed.refreshed,
+            reason: refreshed.reason,
+            expiresAt: refreshed.token.expiresAt,
+        });
+        if (options.json) {
+            io.log(JSON.stringify(output, null, 2));
+            return;
+        }
+        io.log("MCP OAuth token refreshed");
+        io.log("Expires at " + refreshed.token.expiresAt);
+        return;
+    }
+    if (action === "clear") {
+        const result = await clearMcpToken(config);
+        if (options.json) {
+            io.log(JSON.stringify(result, null, 2));
+            return;
+        }
+        io.log("MCP OAuth token cleared");
+        return;
+    }
+    throw new Error("unknown MCP OAuth token command: " + (action ?? ""));
+}
+async function mcpConfigFromOptions(options) {
+    const fileConfig = stringOption(options.config)
+        ? JSON.parse(await readFile(stringOption(options.config), "utf8"))
+        : {};
+    const config = removeUndefined({
+        ...fileConfig,
+        enabled: options.enable === undefined
+            ? fileConfig.enabled
+            : Boolean(options.enable),
+        mode: stringOption(options.mode) === undefined
+            ? fileConfig.mode
+            : parseMcpProxyMode(stringOption(options.mode)),
+        serverUrl: stringOption(options["server-url"]) ?? fileConfig.serverUrl,
+        authorizationUrl: stringOption(options["authorization-url"]) ?? fileConfig.authorizationUrl,
+        tokenUrl: stringOption(options["token-url"]) ?? fileConfig.tokenUrl,
+        registrationUrl: stringOption(options["registration-url"]) ?? fileConfig.registrationUrl,
+        clientId: stringOption(options["client-id"]) ?? fileConfig.clientId,
+        clientSecret: stringOption(options["client-secret"]) ?? fileConfig.clientSecret,
+        clientName: stringOption(options["client-name"]) ?? fileConfig.clientName,
+        dynamicRegistration: options["dynamic-registration"] === undefined
+            ? fileConfig.dynamicRegistration
+            : Boolean(options["dynamic-registration"]),
+        scopes: stringOption(options.scopes)
+            ? parseCsv(options.scopes)
+            : fileConfig.scopes,
+        tokenStorage: stringOption(options["token-storage"]) === undefined
+            ? fileConfig.tokenStorage
+            : parseMcpSecretStorage(stringOption(options["token-storage"])),
+        tokenPath: stringOption(options["token-path"]) ?? fileConfig.tokenPath,
+        refreshWindowSeconds: stringOption(options["refresh-window"]) === undefined
+            ? fileConfig.refreshWindowSeconds
+            : Number(stringOption(options["refresh-window"])),
+        approvedBy: options.approve
+            ? (stringOption(options.approver) ?? "local-user")
+            : fileConfig.approvedBy,
+    });
+    return removeUndefined({
+        enabled: config.enabled ?? false,
+        mode: config.mode ?? "stdio-proxy",
+        serverUrl: config.serverUrl ?? requireArg(options, "server-url"),
+        authorizationUrl: config.authorizationUrl,
+        tokenUrl: config.tokenUrl,
+        registrationUrl: config.registrationUrl,
+        clientId: config.clientId,
+        clientSecret: config.clientSecret,
+        clientName: config.clientName,
+        dynamicRegistration: config.dynamicRegistration,
+        scopes: config.scopes,
+        tokenStorage: config.tokenStorage ?? "keychain",
+        tokenPath: config.tokenPath,
+        refreshWindowSeconds: config.refreshWindowSeconds ?? 300,
+        approvedBy: config.approvedBy,
+    });
+}
 function parseMcpProxyMode(value) {
     if (["stdio-proxy", "direct-http", "tool-native-oauth"].includes(value)) {
         return value;

package/dist/tool-commands.js.map

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