@soleri/forge 9.7.2 → 9.8.0

package/src/templates/setup-script.ts

@@ -322,6 +322,77 @@ else
     echo "Note: Add $AGENT_DIR/scripts to PATH, or symlink $AGENT_DIR/scripts/$AGENT_NAME to /usr/local/bin/$AGENT_NAME"
   fi
 fi
+
+# Configure OpenCode enforcement plugin (hooks)
+OPENCODE_PLUGINS_DIR="$AGENT_DIR/.opencode/plugins"
+ENFORCEMENT_PLUGIN="$OPENCODE_PLUGINS_DIR/soleri-enforcement.ts"
+
+echo ""
+echo "Configuring OpenCode enforcement plugin..."
+mkdir -p "$OPENCODE_PLUGINS_DIR"
+
+if [ -f "$ENFORCEMENT_PLUGIN" ]; then
+  echo "[ok] Enforcement plugin already exists — skipping"
+else
+  cat > "$ENFORCEMENT_PLUGIN" << PLUGIN
+/**
+ * Soleri enforcement plugin for OpenCode.
+ * Auto-generated by setup script — do not edit manually.
+ *
+ * Hooks:
+ * - tool.execute.before: block destructive commands (anti-deletion)
+ * - session.compacted: capture session summary before context compaction
+ * - session.created: clean stale git worktrees on session start
+ */
+
+const DESTRUCTIVE_PATTERNS = [
+  /\\brm\\s+(-[rRf]+\\s+|--force\\s+|--recursive\\s+)/,
+  /\\brmdir\\b/,
+  /\\bgit\\s+push\\s+--force\\b/,
+  /\\bgit\\s+push\\s+-f\\b/,
+  /\\bgit\\s+reset\\s+--hard\\b/,
+  /\\bgit\\s+clean\\s+-[a-zA-Z]*f/,
+];
+
+export default {
+  hooks: {
+    'tool.execute.before': (ctx) => {
+      // Anti-deletion: intercept destructive commands
+      const input = JSON.stringify(ctx.input ?? '');
+      for (const pattern of DESTRUCTIVE_PATTERNS) {
+        if (pattern.test(input)) {
+          throw new Error(
+            '[soleri-anti-deletion] BLOCKED: Destructive command detected. ' +
+            'Use explicit confirmation or a safer alternative.'
+          );
+        }
+      }
+    },
+    'session.compacted': (ctx) => {
+      // Session capture: call op:session_capture before context compaction
+      console.info(
+        '[soleri-session-capture] Before context is compacted, capture a session summary ' +
+        'by calling ${config.id}_core op:session_capture with a brief summary of what was ' +
+        'accomplished, the topics covered, files modified, and tools used.'
+      );
+    },
+    'session.created': (ctx) => {
+      // Worktree cleanup: clean stale git worktrees on session start
+      try {
+        const { execSync } = require('child_process');
+        execSync('sh $AGENT_DIR/scripts/clean-worktrees.sh', {
+          timeout: 10000,
+          stdio: 'pipe',
+        });
+      } catch (err) {
+        console.warn('[soleri-worktree-cleanup] Failed to clean worktrees:', err.message);
+      }
+    },
+  },
+};
+PLUGIN
+  echo "[ok] Created enforcement plugin at $ENFORCEMENT_PLUGIN"
+fi
 `
     : '';
 

package/src/templates/shared-rules.ts

@@ -341,13 +341,29 @@ const ENGINE_RULES_LINES: string[] = [
   '',
   '### The Non-Negotiable Rule',
   '',
-  '`op:orchestrate_complete` runs for EVERY task — simple or complex. This captures:',
+  '`op:orchestrate_complete` runs for EVERY task — simple or complex. But it is **user-gated**: never auto-complete without confirmation.',
+  '',
+  'This captures:',
   '- Knowledge to vault (patterns learned, decisions made)',
   '- Session summary (what was done, files changed)',
   "- Brain feedback (what worked, what didn't)",
   '',
   'Without completion, the knowledge trail is lost. The code is in git, but the WHY disappears.',
   '',
+  '### Reconciliation Triggers',
+  '',
+  '`op:orchestrate_complete` is triggered by one of three conditions — all require user confirmation before running.',
+  '',
+  '| Trigger | Condition | Agent Action |',
+  '|---------|-----------|--------------|',
+  '| **Explicit** | User says "done", "ship it", "looks good", "wrap up" | Call `op:orchestrate_complete` immediately |',
+  '| **Plan-complete** | All plan tasks reach terminal state (completed/skipped/failed) | Ask: "All tasks are complete. Want me to wrap up and capture what we learned, or is there more to fix?" |',
+  '| **Idle** | Plan in `executing` state with no recent task work | Ask: "We\'ve been idle on this plan. Ready to wrap up, or still working?" |',
+  '',
+  '**NEVER auto-complete without asking the user.** The agent detects readiness but the user decides when to finalize.',
+  '',
+  'Use `op:orchestrate_status` to check plan readiness — it includes a `readiness` field with `allTasksTerminal`, `terminalCount`, `totalCount`, and `idleSince` for the active plan.',
+  '',
   '### Exceptions (skip assessment, execute directly)',
   '',
   '- Read-only operations (search, status, health check)',
@@ -588,6 +604,7 @@ const ENGINE_RULES_LINES: string[] = [
   '```',
   '',
   'The scaffolded agent is ready immediately — no build step, no npm install for the agent itself.',
+  'Git is initialized by default (`git init` + initial commit). Use `--no-git` to skip. After scaffolding, the CLI offers to set up a remote via `gh repo create` (if gh CLI is available) or a manual remote URL. The `--yes` flag enables git init but skips the remote prompt.',
   '',
   '### Updating Soleri',
   '',
@@ -631,11 +648,14 @@ const ENGINE_RULES_LINES: string[] = [
   'The composition pipeline assembles CLAUDE.md from:',
   '',
   '1. **Agent identity** — from `agent.yaml`',
-  '2. **Engine rules** — from `@soleri/forge` shared rules (this section)',
-  '3. **User instructions** — from `instructions/*.md` (alphabetically sorted)',
-  '4. **Tools table** — from engine registration',
-  '5. **Workflow index** — from `workflows/`',
-  '6. **Skills index** — from `skills/`',
+  '2. **Custom instructions** — from `instructions/user.md` (priority placement, before engine rules)',
+  '3. **Engine rules** — from `@soleri/forge` shared rules (this section)',
+  '4. **User instructions** — from `instructions/*.md` (alphabetically sorted, excluding `user.md` and `_engine.md`)',
+  '5. **Tools table** — from engine registration',
+  '6. **Workflow index** — from `workflows/`',
+  '7. **Skills index** — from `skills/`',
+  '',
+  '`instructions/user.md` is the recommended place for your most important agent-specific rules — it appears early in CLAUDE.md for maximum influence on model behavior. Other `instructions/*.md` files are included after engine rules.',
   '',
   'When the engine updates (`@soleri/core` or `@soleri/forge`), running `soleri agent refresh` regenerates CLAUDE.md with the latest shared rules. Your own `instructions/*.md` files are where agent-specific behavior lives — those survive regeneration.',
   '',
@@ -687,6 +707,10 @@ const ENGINE_RULES_LINES: string[] = [
   '',
   '### Hooks & Skills',
   '',
+  'Your agent ships with **essential skills** by default (agent-guide, agent-persona, vault-navigator, vault-capture, systematic-debugging, writing-plans, context-resume). Install more with `soleri skills install <name>`. List available skills with `soleri skills list`.',
+  '',
+  'To scaffold all skills instead, set `skillsFilter: all` in `agent.yaml`.',
+  '',
   '| Command | What it does |',
   '|---------|-------------|',
   '| `soleri hooks list-packs` | Show available hook packs and their status |',
@@ -701,6 +725,7 @@ const ENGINE_RULES_LINES: string[] = [
   '|---------|-------------|',
   '| `soleri install` | Register agent as MCP server (`--target opencode\\|claude\\|codex\\|all`) |',
   '| `soleri uninstall` | Remove agent MCP server entry |',
+  '| `soleri create --no-git` | Scaffold agent without git initialization |',
   '| `soleri governance --show` | Show vault governance policy |',
   '| `soleri governance --preset <name>` | Set policy preset (strict\\|moderate\\|permissive) |',
   '| `soleri upgrade` | Upgrade @soleri/cli (`--check` to preview) |',
@@ -749,6 +774,28 @@ const ENGINE_RULES_LINES: string[] = [
   '- Any file inside `@soleri/core` or `@soleri/forge`',
   '',
 
+  // ─── Workspace Routing ─────────────────────────────────────
+  '## Workspace Routing',
+  '<!-- soleri:workspace-routing -->',
+  '',
+  'Agents can define **workspaces** — scoped context areas with their own CONTEXT.md files — and a **routing table** that maps task patterns to workspaces.',
+  '',
+  '### How It Works',
+  '',
+  '1. When a task matches a routing pattern, navigate to that workspace.',
+  "2. Load the workspace's CONTEXT.md for task-specific instructions and context.",
+  '3. Activate only the skills listed in the routing entry.',
+  '4. If no pattern matches, use the default root context (agent-level CLAUDE.md).',
+  '',
+  '### Routing Rules',
+  '',
+  '- Patterns are matched by semantic similarity, not exact string match.',
+  '- The routing table is defined in `agent.yaml` under the `routing:` key.',
+  '- Workspaces are directories under `workspaces/{id}/` with a CONTEXT.md file.',
+  '- When entering a workspace, its CONTEXT.md supplements (not replaces) the root context.',
+  '- Skills listed in the routing entry are prioritized but do not prevent other skills from activating.',
+  '',
+
   // ─── Verification Protocol ─────────────────────────────────
   '## Verification Protocol',
   '<!-- soleri:verification-protocol -->',