oh-my-copilot 4.13.0 → 4.13.2

package/scripts/post-tool-verifier.mjs

@@ -703,6 +703,55 @@ export function detectWriteFailure(output) {
   return errorPatterns.some(pattern => pattern.test(cleaned));
 }
 
+// Detect Copilot CLI's deterministic write/edit success markers so docs or
+// serialized tool output containing diagnostic prose do not override success.
+export function isCopilotCliWriteSuccess(output) {
+  if (!output) return false;
+
+  const cleaned = stripClaudeTempCwdErrors(output);
+  const successPatterns = [
+    /(^|\n)The file .+ has been updated successfully\.?(\n|$)/i,
+    /(^|\n)File (?:created|written|updated) successfully(?:\s+at:\s*.+)?\.?(\n|$)/i,
+    /(^|\n).*file state is current in your context\b.*(\n|$)/i,
+  ];
+
+  return successPatterns.some(pattern => pattern.test(cleaned));
+}
+
+function extractTextFromKnownToolResponseField(value, depth = 0) {
+  if (typeof value === 'string') return [value];
+  if (!value || depth > 4) return [];
+
+  if (Array.isArray(value)) {
+    return value.flatMap(item => extractTextFromKnownToolResponseField(item, depth + 1));
+  }
+
+  if (typeof value !== 'object') return [];
+
+  const textFields = ['text', 'message', 'result', 'output', 'stdout'];
+  const texts = [];
+  for (const field of textFields) {
+    if (typeof value[field] === 'string') {
+      texts.push(value[field]);
+    }
+  }
+
+  if (
+    'content' in value &&
+    value.content &&
+    (Array.isArray(value.content) || typeof value.content === 'object')
+  ) {
+    texts.push(...extractTextFromKnownToolResponseField(value.content, depth + 1));
+  }
+
+  return texts;
+}
+
+function hasStructuredWriteSuccess(rawResponse) {
+  if (!rawResponse || typeof rawResponse === 'string') return false;
+  return extractTextFromKnownToolResponseField(rawResponse).some(isCopilotCliWriteSuccess);
+}
+
 // Get agent completion summary from tracking state
 function getAgentCompletionSummary(directory, quietLevel = QUIET_LEVEL) {
   const trackingFile = join(directory, '.omcp', 'state', 'subagent-tracking.json');
@@ -731,7 +780,7 @@ function getAgentCompletionSummary(directory, quietLevel = QUIET_LEVEL) {
 
 // Generate contextual message
 function generateMessage(toolName, toolOutput, sessionId, toolCount, directory, options = {}) {
-  const { wasTruncated = false, rawLength = 0 } = options;
+  const { wasTruncated = false, rawLength = 0, structuredWriteSuccess = false } = options;
   let message = '';
 
   switch (toolName) {
@@ -782,7 +831,7 @@ function generateMessage(toolName, toolOutput, sessionId, toolCount, directory,
     }
 
     case 'Edit':
-      if (detectWriteFailure(toolOutput)) {
+      if (!structuredWriteSuccess && !isCopilotCliWriteSuccess(toolOutput) && detectWriteFailure(toolOutput)) {
         message = 'Edit operation failed. Verify file exists and content matches exactly.';
       } else if (QUIET_LEVEL === 0) {
         message = 'Code modified. Verify changes work as expected before marking complete.';
@@ -790,7 +839,7 @@ function generateMessage(toolName, toolOutput, sessionId, toolCount, directory,
       break;
 
     case 'Write':
-      if (detectWriteFailure(toolOutput)) {
+      if (!structuredWriteSuccess && !isCopilotCliWriteSuccess(toolOutput) && detectWriteFailure(toolOutput)) {
         message = 'Write operation failed. Check file permissions and directory existence.';
       } else if (QUIET_LEVEL === 0) {
         message = 'File written. Test the changes to ensure they work correctly.';
@@ -847,6 +896,8 @@ async function main() {
 
     const toolName = data.tool_name || data.toolName || '';
     const rawResponse = data.tool_response || data.toolOutput || '';
+    const structuredWriteSuccess =
+      (toolName === 'Write' || toolName === 'Edit') && hasStructuredWriteSuccess(rawResponse);
     const toolOutput = typeof rawResponse === 'string' ? rawResponse : JSON.stringify(rawResponse);
     const { clipped: clippedToolOutput, wasTruncated } = clipToolOutputForAnalysis(toolName, toolOutput);
     const sessionId = data.session_id || data.sessionId || 'unknown';
@@ -892,6 +943,7 @@ async function main() {
       generateMessage(toolName, clippedToolOutput, sessionId, toolCount, directory, {
         wasTruncated,
         rawLength: toolOutput.length,
+        structuredWriteSuccess,
       }),
       maybeBuildPreemptiveCompactionMessage(toolName, data, directory),
     );

package/scripts/pre-tool-enforcer.mjs

@@ -82,10 +82,10 @@ function readAgentDefinitionModel(subagentType) {
   // Reject path traversal: agent names are simple identifiers; no path separators allowed.
   if (!/^[a-zA-Z0-9_-]+$/.test(agentType)) return null;
   // Build a prioritised list of agents/ directories to search.
-  // CLAUDE_PLUGIN_ROOT is tried first when set; the script-relative path is always the
+  // PLUGIN_ROOT is tried first when set; the script-relative path is always the
   // final fallback. Checking per-file (not just per-directory) means a partially-populated
   // plugin install doesn't hide agents that exist in the script-relative tree.
-  const pluginRoot = process.env.CLAUDE_PLUGIN_ROOT;
+  const pluginRoot = process.env.PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT;
   const scriptAgentsDir = join(dirname(fileURLToPath(import.meta.url)), '..', 'agents');
   const candidateDirs = [
     ...(pluginRoot ? [join(pluginRoot, 'agents')] : []),
@@ -755,12 +755,8 @@ async function main() {
               ? `Set ANTHROPIC_DEFAULT_${derivedTier}_MODEL=<valid-bedrock-id> in settings.json env, or set OMC_SUBAGENT_MODEL as a global override.`
               : `Remove the \`model\` parameter, or set ANTHROPIC_DEFAULT_SONNET_MODEL=<valid-bedrock-id> in settings.json env.`;
             console.log(JSON.stringify({
-              continue: true,
-              hookSpecificOutput: {
-                hookEventName: 'PreToolUse',
-                permissionDecision: 'deny',
-                permissionDecisionReason: `[MODEL ROUTING] This environment uses a non-standard provider (Bedrock/Vertex/proxy). ${guidance} The model "${toolModel}" is not valid for this provider.`
-              }
+              permissionDecision: 'deny',
+              permissionDecisionReason: `[MODEL ROUTING] This environment uses a non-standard provider (Bedrock/Vertex/proxy). ${guidance} The model "${toolModel}" is not valid for this provider.`
             }));
             return;
           }
@@ -777,12 +773,8 @@ async function main() {
             ? `Pass model="${tierAlias}" explicitly on this ${toolName} call — tier aliases resolve cleanly on Bedrock.`
             : `Pass model="${tierAlias}" explicitly on this ${toolName} call, and set ANTHROPIC_DEFAULT_${tierAlias.toUpperCase()}_MODEL=<valid-bedrock-id> in settings.json env.`;
           console.log(JSON.stringify({
-            continue: true,
-            hookSpecificOutput: {
-              hookEventName: 'PreToolUse',
-              permissionDecision: 'deny',
-              permissionDecisionReason: `[MODEL ROUTING] Your session model "${sessionModel}" has a context-window suffix ([1m]) that sub-agents cannot inherit — the runtime strips it to a bare Anthropic model ID which is invalid on Bedrock. ${suggestion}`
-            }
+            permissionDecision: 'deny',
+            permissionDecisionReason: `[MODEL ROUTING] Your session model "${sessionModel}" has a context-window suffix ([1m]) that sub-agents cannot inherit — the runtime strips it to a bare Anthropic model ID which is invalid on Bedrock. ${suggestion}`
           }));
           return;
         }
@@ -804,12 +796,8 @@ async function main() {
             const guidance = `Add model="${defTierAlias}" to this ${toolName} call — tier aliases resolve to configured provider models (${resolvedModel}).`;
             const agentType = (toolInput.subagent_type).replace(/^oh-my-copilot:/, '');
             console.log(JSON.stringify({
-              continue: true,
-              hookSpecificOutput: {
-                hookEventName: 'PreToolUse',
-                permissionDecision: 'deny',
-                permissionDecisionReason: `[MODEL ROUTING] Agent type "${agentType}" has model "${agentDefModel}" in its definition, which is not valid for this Bedrock/Vertex/proxy environment. ${guidance}`
-              }
+              permissionDecision: 'deny',
+              permissionDecisionReason: `[MODEL ROUTING] Agent type "${agentType}" has model "${agentDefModel}" in its definition, which is not valid for this Bedrock/Vertex/proxy environment. ${guidance}`
             }));
             return;
           }
@@ -823,7 +811,7 @@ async function main() {
     // Fires in PreToolUse so users get notified BEFORE the tool blocks for input (#597)
     if (toolName === 'AskUserQuestion') {
       try {
-        const pluginRoot = process.env.CLAUDE_PLUGIN_ROOT;
+        const pluginRoot = process.env.PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT;
         if (pluginRoot) {
           const { notify } = await import(pathToFileURL(join(pluginRoot, 'dist', 'notifications', 'index.js')).href);
 

package/scripts/project-memory-session.mjs

@@ -12,7 +12,7 @@ const __filename = fileURLToPath(import.meta.url);
 const __dirname = dirname(__filename);
 
 function getRuntimeBaseDir() {
-  return process.env.CLAUDE_PLUGIN_ROOT || join(__dirname, '..');
+  return process.env.PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT || join(__dirname, '..');
 }
 
 // Import timeout-protected stdin reader (prevents hangs on Linux/Windows, see issue #240, #524)

package/scripts/run.cjs

@@ -10,9 +10,9 @@
  * /usr/bin/sh is a PE32+ binary the OS refuses to execute natively.
  * Fixes issues #909, #899, #892, #869.
  *
- * Usage (from hooks.json, after setup patches the absolute node path in):
- *   /abs/path/to/node "${CLAUDE_PLUGIN_ROOT}/scripts/run.cjs" \
- *       "${CLAUDE_PLUGIN_ROOT}/scripts/<hook>.mjs" [args...]
+ * Usage (from hooks.json):
+ *   /abs/path/to/node "${PLUGIN_ROOT}/scripts/run.cjs" \
+ *       "${PLUGIN_ROOT}/scripts/<hook>.mjs" [args...]
  *
  * During post-install setup, the leading `node` token is replaced with
  * process.execPath so nvm/fnm users and Windows users all get the right binary.
@@ -24,16 +24,16 @@ const { join, basename, dirname } = require('path');
 
 const target = process.argv[2];
 if (!target) {
-  // Nothing to run — exit cleanly so Claude Code hooks are never blocked.
+  // Nothing to run — exit cleanly so hooks are never blocked.
   process.exit(0);
 }
 
 /**
- * Resolve the hook script target path, handling stale CLAUDE_PLUGIN_ROOT.
+ * Resolve the hook script target path, handling stale PLUGIN_ROOT.
  *
  * When a plugin update replaces an old version directory with a symlink (or
  * deletes it entirely), sessions that still reference the old version via
- * CLAUDE_PLUGIN_ROOT will fail with MODULE_NOT_FOUND.
+ * PLUGIN_ROOT will fail with MODULE_NOT_FOUND.
  *
  * Resolution strategy:
  *   1. Use the target as-is if it exists.
@@ -57,10 +57,10 @@ function resolveTarget(targetPath) {
   }
 
   // Fallback: scan plugin cache for the same script in the latest version.
-  // CLAUDE_PLUGIN_ROOT is e.g. ~/.claude/plugins/cache/omc/oh-my-copilot/4.2.14
+  // PLUGIN_ROOT is e.g. ~/.copilot/plugins/cache/omc/oh-my-copilot/4.2.14
   // We look one level up for sibling version directories.
   try {
-    const pluginRoot = process.env.CLAUDE_PLUGIN_ROOT;
+    const pluginRoot = process.env.PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT;
     if (!pluginRoot) return null;
 
     const cacheBase = dirname(pluginRoot);          // .../oh-my-copilot/
@@ -134,7 +134,7 @@ function resolveHookTimeoutMs(targetPath, extraArgs) {
 const resolved = resolveTarget(target);
 if (!resolved) {
   // Target not found anywhere — exit cleanly so hooks are never blocked.
-  // This is the graceful fallback for stale CLAUDE_PLUGIN_ROOT paths.
+  // This is the graceful fallback for stale PLUGIN_ROOT paths.
   process.exit(0);
 }
 

package/scripts/safe-command-approver.mjs

@@ -0,0 +1,156 @@
+#!/usr/bin/env node
+
+/**
+ * OMC Safe Command Approver (PreToolUse)
+ *
+ * Auto-approves known-safe Bash commands (git status, npm test, dotnet build, etc.)
+ * so they don't trigger an interactive permission prompt. Works on both Copilot CLI
+ * and Claude Code — migrated from the Claude-Code-only permissionRequest handler.
+ *
+ * For non-Bash tools or unrecognised commands, outputs nothing (passes through to
+ * the runtime's native permission flow).
+ *
+ * Hook output (preToolUse — Copilot CLI compliant):
+ *   - Allow ({ permissionDecision: "allow" }) for safe commands
+ *   - No output for everything else (defer to runtime)
+ */
+
+import { readStdin } from './lib/stdin.mjs';
+
+// --- Safe command patterns (mirrored from src/hooks/permission-handler/index.ts) ---
+
+const SAFE_PATTERNS = [
+  /^git (status|diff|log|branch|show|fetch)/,
+  /^npm (test|run (test|lint|build|check|typecheck))/,
+  /^pnpm (test|run (test|lint|build|check|typecheck))/,
+  /^yarn (test|run (test|lint|build|check|typecheck))/,
+  /^tsc( |$)/,
+  /^gh (issue|pr) (view|list|status)\b/,
+  /^eslint /,
+  /^prettier /,
+  /^cargo (test|check|clippy|build)/,
+  /^pytest/,
+  /^python -m pytest/,
+  /^ls( |$)/,
+  /^grep /,
+  /^find /,
+  /^wc /,
+  /^pwd$/,
+  /^which /,
+  /^echo /,
+  /^env$/,
+  /^node --version$/,
+  /^dotnet (--version|--list-sdks|--list-runtimes|--info)$/,
+  /^dotnet (build|test|run|restore|clean)( |$)/,
+  /^gh (pr|issue|repo|api|run|workflow) (view|list|status|diff|checks)/,
+  /^gh auth status/,
+  /^az (account show|group list|resource list|ad signed-in-user show)/,
+  /^az devops (project list|configure)/,
+  /^az pipelines (list|show|runs list)/,
+  /^az repos (list|show|pr list)/,
+];
+
+// Shell metacharacters that enable command chaining / injection
+const DANGEROUS_SHELL_CHARS = /[;&|`$()<>\n\r\t\0\\{}\[\]*?~!#]/;
+
+// Heredoc operator detection
+const HEREDOC_PATTERN = /<<[-~]?\s*['"]?\w+['"]?/;
+
+const SAFE_HEREDOC_PATTERNS = [
+  /^git commit\b/,
+  /^git tag\b/,
+];
+
+const SAFE_RIPGREP_FLAGS = new Set([
+  '-n', '--line-number', '-S', '--smart-case', '-F', '--fixed-strings',
+  '-i', '--ignore-case', '--no-heading',
+]);
+
+function isSafeCommand(command) {
+  const trimmed = command.trim();
+  if (DANGEROUS_SHELL_CHARS.test(trimmed)) return false;
+  return SAFE_PATTERNS.some(p => p.test(trimmed));
+}
+
+function isHeredocWithSafeBase(command) {
+  const trimmed = command.trim();
+  if (!trimmed.includes('\n')) return false;
+  if (!HEREDOC_PATTERN.test(trimmed)) return false;
+  const firstLine = trimmed.split('\n')[0].trim();
+  return SAFE_HEREDOC_PATTERNS.some(p => p.test(firstLine));
+}
+
+function tokenizeShellCommand(command) {
+  const tokens = [];
+  let current = '';
+  let quote = null;
+  for (const char of command.trim()) {
+    if (quote) { if (char === quote) quote = null; else current += char; continue; }
+    if (char === '"' || char === "'") { quote = char; continue; }
+    if (/\s/.test(char)) { if (current) { tokens.push(current); current = ''; } continue; }
+    current += char;
+  }
+  if (quote) return null;
+  if (current) tokens.push(current);
+  return tokens;
+}
+
+function isRipgrepReadOnly(tokens) {
+  if (tokens[0] !== 'rg') return false;
+  for (let i = 1; i < tokens.length; i++) {
+    const t = tokens[i];
+    if (t.startsWith('-')) {
+      if (SAFE_RIPGREP_FLAGS.has(t)) continue;
+      if (t.startsWith('--type=') || t.startsWith('--glob=') || t.startsWith('-g')) continue;
+      if (t === '--type' || t === '--glob' || t === '-g' || t === '-t') { i++; continue; }
+      return false;
+    }
+  }
+  return true;
+}
+
+function isSafeRepoInspectionCommand(command) {
+  const tokens = tokenizeShellCommand(command);
+  if (!tokens || tokens.length === 0) return false;
+  if (isRipgrepReadOnly(tokens)) return true;
+  if (/^cat( |$)/.test(command) || /^head( |$)/.test(command) || /^tail( |$)/.test(command)) return true;
+  return false;
+}
+
+function isSafeTargetedLocalTestCommand(command) {
+  const tokens = tokenizeShellCommand(command);
+  if (!tokens || tokens.length < 2) return false;
+  const bin = tokens[0];
+  if (bin === 'npx' && tokens[1] === 'vitest' && tokens.includes('run') && tokens.some(t => t.endsWith('.test.ts') || t.endsWith('.test.js'))) return true;
+  if (bin === 'pytest' && tokens.some(t => t.endsWith('.py') || t.includes('::') || t.startsWith('tests/'))) return true;
+  if (bin === 'go' && tokens[1] === 'test' && tokens.some(t => t.startsWith('./') || t.includes('...'))) return true;
+  return false;
+}
+
+async function main() {
+  try {
+    const input = await readStdin();
+    const data = JSON.parse(input);
+
+    const toolName = data.tool_name || data.toolName || '';
+
+    // Only process Bash tool calls
+    if (toolName !== 'Bash') return;
+
+    const command = data.tool_input?.command ?? data.toolInput?.command;
+    if (!command || typeof command !== 'string') return;
+
+    const trimmed = command.trim();
+    if (!trimmed) return;
+
+    if (isSafeCommand(trimmed) || isHeredocWithSafeBase(trimmed)
+        || isSafeRepoInspectionCommand(trimmed) || isSafeTargetedLocalTestCommand(trimmed)) {
+      console.log(JSON.stringify({ permissionDecision: 'allow' }));
+    }
+    // No output for unrecognised commands — defer to runtime's native permission flow
+  } catch {
+    // On error, produce no output — never block on hook failure
+  }
+}
+
+main();

package/scripts/session-start.mjs

@@ -48,8 +48,32 @@ function readJsonFile(path) {
   }
 }
 
+
+const SESSION_ID_ALLOWLIST = /^[a-zA-Z0-9][a-zA-Z0-9_-]{0,255}$/;
+const WORKFLOW_SLOT_TOMBSTONE_TTL_MS = 24 * 60 * 60 * 1000;
+
+function isWorkflowSlotTombstonedForMode(omcRoot, mode, sessionId) {
+  const safeSessionId = typeof sessionId === 'string' && SESSION_ID_ALLOWLIST.test(sessionId) ? sessionId : '';
+  const ledgerPath = safeSessionId
+    ? join(omcRoot, 'state', 'sessions', safeSessionId, 'skill-active-state.json')
+    : join(omcRoot, 'state', 'skill-active-state.json');
+  const ledger = readJsonFile(ledgerPath);
+  const slot = ledger?.active_skills?.[mode];
+  if (!slot || typeof slot !== 'object') return false;
+  if (typeof slot.completed_at !== 'string' || !slot.completed_at) return false;
+  const completedAt = new Date(slot.completed_at).getTime();
+  if (!Number.isFinite(completedAt)) return true;
+  return Date.now() - completedAt < WORKFLOW_SLOT_TOMBSTONE_TTL_MS;
+}
+
+function shouldRestoreModeState(omcRoot, mode, state, sessionId) {
+  if (!state?.active) return false;
+  if (isWorkflowSlotTombstonedForMode(omcRoot, mode, sessionId)) return false;
+  return true;
+}
+
 function getRuntimeBaseDir() {
-  return process.env.CLAUDE_PLUGIN_ROOT || join(__dirname, '..');
+  return process.env.PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT || join(__dirname, '..');
 }
 
 async function loadProjectMemoryModules() {
@@ -143,16 +167,71 @@ function semverCompare(a, b) {
   return 0;
 }
 
+const SESSION_START_CONTEXT_BUDGET = 6000;
+const SESSION_START_OMISSION_NOTICE = '[Additional SessionStart context omitted to preserve the 6000-character aggregate budget.]';
+
+function compactBudgetedText(text, maxChars) {
+  const notice = '\n...[truncated to preserve SessionStart context budget]';
+  if (!text || text.length <= maxChars) return text || '';
+  if (maxChars <= notice.length) return notice.slice(0, Math.max(0, maxChars));
+  return `${text.slice(0, maxChars - notice.length).trimEnd()}${notice}`;
+}
+
+function buildSessionStartAdditionalContext(messages) {
+  if (!Array.isArray(messages) || messages.length === 0) return '';
+
+  const sections = messages.map((message, index) => ({ index, message }));
+  const priorityOrder = [
+    /\[MODEL ROUTING OVERRIDE/,
+    /\[AUTOPILOT MODE RESTORED\]/,
+    /\[ULTRAWORK MODE RESTORED\]/,
+    /\[RALPH LOOP RESTORED\]/,
+    /\[PROJECT MEMORY\]/,
+    /\[NOTEPAD - Priority Context\]/,
+    /\[PENDING TASKS DETECTED\]/,
+  ];
+  const prioritized = [];
+  const remaining = [];
+  for (const section of sections) {
+    const score = priorityOrder.findIndex((pattern) => pattern.test(section.message));
+    if (score !== -1) prioritized.push({ ...section, score });
+    else remaining.push({ ...section, score: priorityOrder.length + section.index });
+  }
+  const ordered = [...prioritized.sort((a, b) => a.score - b.score || a.index - b.index), ...remaining]
+    .map((entry) => entry.message);
+
+  let used = 0;
+  const selected = [];
+  for (const message of ordered) {
+    const separator = selected.length > 0 ? 1 : 0;
+    if (used + separator + message.length > SESSION_START_CONTEXT_BUDGET) {
+      const remainingBudget = SESSION_START_CONTEXT_BUDGET - used - separator;
+      if (remainingBudget > 0) {
+        selected.push(
+          remainingBudget > 120
+            ? compactBudgetedText(message, remainingBudget)
+            : compactBudgetedText(SESSION_START_OMISSION_NOTICE, remainingBudget),
+        );
+      }
+      break;
+    }
+    selected.push(message);
+    used += separator + message.length;
+  }
+
+  return selected.join('\n');
+}
+
 // Extract OMC version from CLAUDE.md content
 function extractOmcVersion(content) {
   const match = content.match(/<!-- OMC:VERSION:(\d+\.\d+\.\d+[^\s]*?) -->/);
   return match ? match[1] : null;
 }
 
-// Get plugin version from CLAUDE_PLUGIN_ROOT
+// Get plugin version from PLUGIN_ROOT
 function getPluginVersion() {
   try {
-    const pluginRoot = process.env.CLAUDE_PLUGIN_ROOT;
+    const pluginRoot = process.env.PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT;
     if (!pluginRoot) return null;
     const pkg = readJsonFile(join(pluginRoot, 'package.json'));
     return pkg?.version || null;
@@ -401,7 +480,7 @@ async function main() {
     } catch {}
 
     // Warn if silentAutoUpdate is enabled but running in plugin mode (#1773)
-    if (process.env.CLAUDE_PLUGIN_ROOT) {
+    if (process.env.PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT) {
       try {
         const omcConfigPath = join(configDir, '.omc-config.json');
         const omcConfig = readJsonFile(omcConfigPath);
@@ -434,7 +513,7 @@ async function main() {
       ultraworkState = readJsonFile(join(omcRoot, 'state', 'ultrawork-state.json'));
     }
 
-    if (ultraworkState?.active) {
+    if (shouldRestoreModeState(omcRoot, 'ultrawork', ultraworkState, sessionId)) {
       messages.push(`<session-restore>
 
 [ULTRAWORK MODE RESTORED]
@@ -467,7 +546,7 @@ Treat this as prior-session context only. Prioritize the user's newest request,
         ralphState = readJsonFile(join(omcRoot, 'ralph-state.json'));
       }
     }
-    if (ralphState?.active) {
+    if (shouldRestoreModeState(omcRoot, 'ralph', ralphState, sessionId)) {
       messages.push(`<session-restore>
 
 [RALPH LOOP RESTORED]
@@ -627,12 +706,13 @@ ${cleanContent}
         }
       }
 
-      // Guard against CLAUDE_PLUGIN_ROOT pointing to a stale/deleted version.
+      // Guard against PLUGIN_ROOT pointing to a stale/deleted version.
       // When an old version directory is removed during upgrade but a running
-      // session still has the old CLAUDE_PLUGIN_ROOT in its environment, the
+      // session still has the old PLUGIN_ROOT in its environment, the
       // directory won't exist. Create a symlink so subsequent hook invocations
       // via run.cjs resolve correctly.
-      const pluginRootEnv = process.env.CLAUDE_PLUGIN_ROOT?.replace(/[\/\\]+$/, ''); // strip trailing separators
+      const pluginRootEnv = (process.env.PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT || '')
+        .replace(/[\/\\]+$/, ''); // strip trailing separators
       if (pluginRootEnv && !existsSync(pluginRootEnv)) {
         const pluginRootVersion = basename(pluginRootEnv);
         if (/^\d+\.\d+\.\d+/.test(pluginRootVersion) && versions.length > 0) {
@@ -667,7 +747,7 @@ ${cleanContent}
 
     // Send session-start notification (non-blocking, fire-and-forget)
     try {
-      const pluginRoot = process.env.CLAUDE_PLUGIN_ROOT;
+      const pluginRoot = process.env.PLUGIN_ROOT || process.env.CLAUDE_PLUGIN_ROOT;
       if (pluginRoot) {
         const { notify } = await import(pathToFileURL(join(pluginRoot, 'dist', 'notifications', 'index.js')).href);
         // Fire and forget - don't await, don't block session start
@@ -697,7 +777,7 @@ ${cleanContent}
         continue: true,
         hookSpecificOutput: {
           hookEventName: 'SessionStart',
-          additionalContext: messages.join('\n')
+          additionalContext: buildSessionStartAdditionalContext(messages)
         }
       }));
     } else {

package/scripts/setup-copilot-instructions.sh

@@ -115,13 +115,14 @@ ensure_local_omc_git_exclude() {
 
   cat >> "$exclude_path" <<'EOF'
 # BEGIN OMC local artifacts
-.omc/*
-!.omc/skills/
-!.omc/skills/**
+!.omcp/
+.omcp/*
+!.omcp/skills/
+!.omcp/skills/**
 # END OMC local artifacts
 EOF
 
-  echo "Configured git exclude for local .omc artifacts (preserving .omc/skills/)"
+  echo "Configured git exclude for local .omcp artifacts (preserving .omcp/skills/)"
 }
 
 # Determine target path