@getforgeai/cli 0.1.0-beta.3 → 0.1.0-beta.4

package/dist/orchestrator/agent-profiles.d.ts

@@ -45,6 +45,12 @@ export type AgentProfile = {
     buildContinueArgs(prompt: string): string[];
     /** Non-secret env vars added to every agent spawn. */
     spawnEnv: Record<string, string>;
+    /**
+     * Whether the engine discovers skills deposited in .claude/skills on its
+     * own (Claude Code and OpenCode do). When false, prompts must carry an
+     * explicit pointer to the SKILL.md — see appendSkillPointer().
+     */
+    nativeSkillDiscovery: boolean;
     /** Container dir holding the session state snapshotted for resume. */
     stateDir: string;
     /** tar --exclude patterns — credentials and cache junk never leave the container. */
@@ -55,6 +61,15 @@ export type AgentProfile = {
 };
 /** Narrow an arbitrary config/dispatch string to a supported AgentType. */
 export declare function resolveAgentType(value: string | undefined): AgentType;
+/**
+ * Make sure a cloud-provided prompt still leads the agent to the deposited
+ * skill. Cloud task/step commands (e.g. "forge_merge_back") replace the
+ * default prompt that pointed at the SKILL.md; engines with native skill
+ * discovery find the skill anyway, but Codex would otherwise never learn the
+ * skill exists. No-op when the engine discovers skills natively or when no
+ * skill was deposited.
+ */
+export declare function appendSkillPointer(prompt: string, profile: AgentProfile, skillName: string | undefined): string;
 export declare function getAgentProfile(agentType: string | undefined): AgentProfile;
 /**
  * Instantiate the stream extractor matching the agent engine.

package/dist/orchestrator/agent-profiles.js

@@ -20,6 +20,19 @@ export function resolveAgentType(value) {
         return value;
     return DEFAULT_AGENT_TYPE;
 }
+/**
+ * Make sure a cloud-provided prompt still leads the agent to the deposited
+ * skill. Cloud task/step commands (e.g. "forge_merge_back") replace the
+ * default prompt that pointed at the SKILL.md; engines with native skill
+ * discovery find the skill anyway, but Codex would otherwise never learn the
+ * skill exists. No-op when the engine discovers skills natively or when no
+ * skill was deposited.
+ */
+export function appendSkillPointer(prompt, profile, skillName) {
+    if (profile.nativeSkillDiscovery || !skillName)
+        return prompt;
+    return `${prompt}\n\nThe "${skillName}" skill at .claude/skills/${skillName}/SKILL.md describes the procedure to follow — read it before starting.`;
+}
 // ---------------------------------------------------------------------------
 // Claude Code
 // ---------------------------------------------------------------------------
@@ -60,6 +73,7 @@ const claudeProfile = {
         return ["--continue", ...this.buildArgs(prompt)];
     },
     spawnEnv: {},
+    nativeSkillDiscovery: true,
     stateDir: "/home/agent/.claude",
     snapshotExcludes: [
         "settings.json",
@@ -132,6 +146,7 @@ const codexProfile = {
         ];
     },
     spawnEnv: {},
+    nativeSkillDiscovery: false,
     stateDir: "/home/agent/.codex",
     snapshotExcludes: ["auth.json", "config.toml", "log"],
     authErrorPatterns: {
@@ -192,6 +207,8 @@ const openCodeProfile = {
         return ["run", "--continue", "--format", "json", prompt];
     },
     spawnEnv: { OPENCODE_PERMISSION: OPENCODE_PERMISSION_JSON },
+    // OpenCode reads .claude/skills natively (OPENCODE_DISABLE_CLAUDE_CODE_SKILLS opts out)
+    nativeSkillDiscovery: true,
     stateDir: "/home/agent/.local/share/opencode",
     snapshotExcludes: ["auth.json", "log", "bin", "cache"],
     authErrorPatterns: {

package/dist/orchestrator/connectors/docker-connector.js

@@ -16,7 +16,7 @@ import { getDockerBridgeGatewayIp } from "../../vm/docker-executor.js";
 import { activeConnections } from "../../lib/connection-manager.js";
 import { vmLog } from "../../vm/log.js";
 import { getConfig } from "../../config/config-manager.js";
-import { getAgentProfile } from "../agent-profiles.js";
+import { appendSkillPointer, getAgentProfile } from "../agent-profiles.js";
 // ---------------------------------------------------------------------------
 // Helpers
 // ---------------------------------------------------------------------------
@@ -168,8 +168,11 @@ export const dockerConnector = {
             await sm.materializeAgentAuth(params.taskId, profile.type);
             // 7. Start MCP bridge (TCP server on host for forge-mcp-relay in container)
             await startSessionMcpBridge(session, params);
-            // 8. Spawn agent
-            const prompt = params.prompt ?? buildDefaultPrompt(params.skillName);
+            // 8. Spawn agent. Cloud-provided prompts get a pointer to the deposited
+            // skill when the engine has no native skill discovery (Codex).
+            const prompt = params.prompt
+                ? appendSkillPointer(params.prompt, profile, params.skill?.name)
+                : buildDefaultPrompt(params.skillName);
             const agentArgs = profile.buildArgs(prompt);
             const env = {};
             vmLog.magenta("docker-connector", `Spawning ${profile.type} agent in container ${sessionId}`, sessionId);
@@ -330,7 +333,9 @@ export const dockerConnector = {
             }
             else {
                 vmLog.warn("docker-connector", `Snapshot restore failed — falling back to prompt in ${sessionId}`, sessionId);
-                const prompt = params.prompt ?? buildDefaultPrompt(params.skillName);
+                const prompt = params.prompt
+                    ? appendSkillPointer(params.prompt, profile, params.skill?.name)
+                    : buildDefaultPrompt(params.skillName);
                 proxy = await sm.spawnAgent(params.taskId, profile.binary, profile.buildArgs(prompt), {}, profile.type);
             }
             // Workflow: keep container alive for idle window

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@getforgeai/cli",
-  "version": "0.1.0-beta.3",
+  "version": "0.1.0-beta.4",
   "description": "ForgeAI CLI — runs AI coding agents in local Docker containers with your own AI tokens, and connects them to the ForgeAI cockpit.",
   "license": "Apache-2.0",
   "type": "module",