orbital-command 0.3.0 → 1.0.1

package/server/init.ts

@@ -1,14 +1,13 @@
 /**
- * Shared init logic — used by both the CLI (`orbital init`) and
- * programmatic callers (e.g. tests).
+ * Shared init logic — used by the wizard and
+ * programmatic callers (e.g. tests, API routes).
  */
 
 import fs from 'fs';
 import path from 'path';
 import { fileURLToPath } from 'url';
-import { GLOBAL_PRIMITIVES_DIR, ensureOrbitalHome, unregisterProject } from './global-config.js';
+import { GLOBAL_PRIMITIVES_DIR, ensureOrbitalHome } from './global-config.js';
 import {
-  loadManifest,
   saveManifest,
   createManifest,
   hashFile,
@@ -17,18 +16,9 @@ import {
   userFileRecord,
   isSelfHosting,
   getSymlinkTarget,
-  createBackup,
-  refreshFileStatuses,
-  reverseRemapPath,
-  safeBackupFile,
-  safeCopyTemplate,
 } from './manifest.js';
 import type { OrbitalManifest } from './manifest-types.js';
-import { needsLegacyMigration, migrateFromLegacy } from './migrate-legacy.js';
-import { computeUpdatePlan, loadRenameMap, formatPlan, getFilesToBackup } from './update-planner.js';
-import { syncSettingsHooks, removeAllOrbitalHooks, getTemplateChecksum } from './settings-sync.js';
-import { migrateConfig } from './config-migrator.js';
-import { validate, formatValidationReport } from './validator.js';
+import { getTemplateChecksum } from './settings-sync.js';
 import { getPackageVersion as _getPackageVersionUtil } from './utils/package-info.js';
 
 const __filename = fileURLToPath(import.meta.url);
@@ -252,7 +242,8 @@ function generateManifest(config: Record<string, unknown>): string {
   lines.push('');
 
   lines.push('# ─── Entry point status ───');
-  lines.push(`WORKFLOW_ENTRY_STATUS="${(config.entryPoint as string) || (lists[0]?.id as string) || 'todo'}"`);
+  const entryPointId = (lists.find((l) => l.isEntryPoint)?.id as string) || (lists[0]?.id as string) || 'todo';
+  lines.push(`WORKFLOW_ENTRY_STATUS="${entryPointId}"`);
   lines.push('');
 
   const listMap = new Map(lists.map((l) => [l.id, l]));
@@ -279,6 +270,25 @@ function generateManifest(config: Record<string, unknown>): string {
   lines.push(')');
   lines.push('');
 
+  lines.push('# ─── Commit session branch patterns (regex) ───');
+  lines.push(`WORKFLOW_COMMIT_BRANCHES="${(config.commitBranchPatterns as string) ?? ''}"`);
+  lines.push('');
+
+  lines.push('# ─── Backward-compat direction aliases (alias:from:to:sessionKey) ───');
+  lines.push('WORKFLOW_DIRECTION_ALIASES=(');
+  for (const edge of (config.edges as Array<Record<string, unknown>>) || []) {
+    if (edge.direction !== 'forward' || !edge.dispatchOnly) continue;
+    const targetList = listMap.get(edge.to as string);
+    if (!targetList) continue;
+    const group = targetList.group as string | undefined;
+    if (group?.startsWith('deploy')) {
+      const sessionKey = (targetList.sessionKey as string) ?? '';
+      lines.push(`  "to-${edge.to as string}:${edge.from as string}:${edge.to as string}:${sessionKey}"`);
+    }
+  }
+  lines.push(')');
+  lines.push('');
+
   lines.push('# ─── Helper functions ──────────────────────────────');
   lines.push('');
   lines.push('status_to_dir() {');
@@ -625,12 +635,16 @@ export function seedGlobalPrimitives(): void {
   }
 }
 
-export { TEMPLATES_DIR, ensureDir };
+export { TEMPLATES_DIR, ensureDir, cleanEmptyDirs, chmodScripts, listTemplateFiles, writeManifest, generateIndexMd, getPackageVersion };
 
 // Re-export manifest utilities for CLI access via loadSharedModule()
 export { loadManifest, saveManifest, hashFile, buildTemplateInventory, refreshFileStatuses, summarizeManifest } from './manifest.js';
 export { validate, formatValidationReport } from './validator.js';
 
+// Re-export update and uninstall from their new homes (backward compat for loadSharedModule)
+export { runUpdate, type UpdateOptions } from './update.js';
+export { runUninstall, type UninstallOptions } from './uninstall.js';
+
 export interface InitOptions {
   force?: boolean;
   quiet?: boolean;              // suppress console output (used by wizard)
@@ -905,430 +919,5 @@ export function runInit(projectRoot: string, options: InitOptions = {}): void {
   log(`\nDone. ${totalCreated} files installed, ${totalSkipped} skipped (use --force to overwrite).`);
 }
 
-export interface UpdateOptions {
-  dryRun?: boolean;
-  force?: boolean;
-}
-
-export function runUpdate(projectRoot: string, options: UpdateOptions = {}): void {
-  const { dryRun = false } = options;
-  const claudeDir = path.join(projectRoot, '.claude');
-  const newVersion = getPackageVersion();
-
-  console.log(`\nOrbital Command — update${dryRun ? ' (dry run)' : ''}`);
-  console.log(`Project root: ${projectRoot}\n`);
-
-  // 1. Load or create manifest (auto-migrate legacy installs)
-  let manifest = loadManifest(projectRoot);
-  if (!manifest) {
-    if (needsLegacyMigration(projectRoot)) {
-      console.log('  Migrating from legacy install...');
-      const result = migrateFromLegacy(projectRoot, TEMPLATES_DIR, newVersion);
-      console.log(`  Migrated ${result.synced} synced, ${result.modified} modified, ${result.userOwned} user-owned files`);
-      if (result.importedPins > 0) console.log(`  Imported ${result.importedPins} pinned files from orbital-sync.json`);
-      manifest = loadManifest(projectRoot);
-    }
-    if (!manifest) {
-      console.log('  No manifest found. Run `orbital init` first.');
-      return;
-    }
-  }
-
-  const oldVersion = manifest.packageVersion;
-
-  // 1b. Refresh file statuses so outdated vs modified is accurate
-  refreshFileStatuses(manifest, claudeDir);
-
-  // 2. Compute update plan
-  const renameMap = loadRenameMap(TEMPLATES_DIR, oldVersion, newVersion);
-  const plan = computeUpdatePlan({
-    templatesDir: TEMPLATES_DIR,
-    claudeDir,
-    manifest,
-    newVersion,
-    renameMap,
-  });
-
-  // 3. Dry-run mode — print plan and exit
-  if (dryRun) {
-    console.log(formatPlan(plan, oldVersion, newVersion));
-    return;
-  }
-
-  if (plan.isEmpty && oldVersion === newVersion) {
-    console.log('  Everything up to date. No changes needed.');
-  }
-
-  // 4. Create backup of files that will be modified
-  const filesToBackup = getFilesToBackup(plan);
-  if (filesToBackup.length > 0) {
-    const backupDir = createBackup(claudeDir, filesToBackup);
-    if (backupDir) {
-      console.log(`  Backup   ${filesToBackup.length} files → ${path.relative(claudeDir, backupDir)}/`);
-    }
-  }
-
-  // 5. Execute plan
-  const templateInventory = buildTemplateInventory(TEMPLATES_DIR);
-
-  // 5a. Handle renames
-  for (const { from, to } of plan.toRename) {
-    const fromPath = path.join(claudeDir, from);
-    const toPath = path.join(claudeDir, to);
-    const toDir = path.dirname(toPath);
-    if (!fs.existsSync(toDir)) fs.mkdirSync(toDir, { recursive: true });
-
-    if (fs.existsSync(fromPath)) {
-      safeBackupFile(fromPath);
-      const stat = fs.lstatSync(fromPath);
-      if (stat.isSymbolicLink()) {
-        // Recreate symlink at new path pointing to remapped template
-        const target = fs.readlinkSync(fromPath);
-        fs.unlinkSync(fromPath);
-        fs.symlinkSync(target, toPath);
-      } else {
-        fs.renameSync(fromPath, toPath);
-      }
-    }
-
-    // Transfer manifest record
-    const record = manifest.files[from];
-    if (record) {
-      delete manifest.files[from];
-      const newHash = templateInventory.get(to);
-      manifest.files[to] = { ...record, templateHash: newHash, installedHash: newHash || record.installedHash };
-    }
-    console.log(`  RENAME  ${from} → ${to}`);
-  }
-
-  // 5b. Add new files
-  for (const filePath of plan.toAdd) {
-    const templateHash = templateInventory.get(filePath);
-    if (!templateHash) continue;
-
-    const destPath = path.join(claudeDir, filePath);
-    const destDir = path.dirname(destPath);
-    if (!fs.existsSync(destDir)) fs.mkdirSync(destDir, { recursive: true });
-
-    copyTemplateFile(TEMPLATES_DIR, filePath, destPath);
-    manifest.files[filePath] = templateFileRecord(templateHash);
-    console.log(`  ADD     ${filePath}`);
-  }
-
-  // 5c. Update changed synced/outdated files
-  for (const filePath of plan.toUpdate) {
-    const templateHash = templateInventory.get(filePath);
-    if (!templateHash) continue;
-
-    const destPath = path.join(claudeDir, filePath);
-    safeBackupFile(destPath);
-    copyTemplateFile(TEMPLATES_DIR, filePath, destPath);
-    manifest.files[filePath] = templateFileRecord(templateHash);
-    console.log(`  UPDATE  ${filePath}`);
-  }
-
-  // 5d. Remove deleted files
-  for (const filePath of plan.toRemove) {
-    const absPath = path.join(claudeDir, filePath);
-    if (fs.existsSync(absPath)) {
-      safeBackupFile(absPath);
-      fs.unlinkSync(absPath);
-    }
-    delete manifest.files[filePath];
-    console.log(`  REMOVE  ${filePath}`);
-  }
-
-  // 5e. Update pinned/modified file records (record new template hash without touching file)
-  for (const { file, reason, newTemplateHash } of plan.toSkip) {
-    if (manifest.files[file]) {
-      manifest.files[file].templateHash = newTemplateHash;
-    }
-    if (reason === 'modified') {
-      console.log(`  SKIP    ${file} (user modified)`);
-    } else {
-      console.log(`  SKIP    ${file} (pinned)`);
-    }
-  }
-
-  // 5f. Clean up empty directories
-  for (const dir of ['hooks', 'skills', 'agents', 'config/workflows']) {
-    const dirPath = path.join(claudeDir, dir);
-    if (fs.existsSync(dirPath)) cleanEmptyDirs(dirPath);
-  }
-
-  // 6. Bidirectional settings hook sync
-  const settingsTarget = path.join(claudeDir, 'settings.local.json');
-  const settingsSrc = path.join(TEMPLATES_DIR, 'settings-hooks.json');
-  const syncResult = syncSettingsHooks(settingsTarget, settingsSrc, manifest.settingsHooksChecksum, renameMap);
-  if (!syncResult.skipped) {
-    console.log(`  Settings +${syncResult.added} -${syncResult.removed} hooks (${syncResult.updated} renamed)`);
-    manifest.settingsHooksChecksum = getTemplateChecksum(settingsSrc);
-  }
-
-  // 7. Config migrations
-  const configPath = path.join(claudeDir, 'orbital.config.json');
-  const migrationResult = migrateConfig(configPath, manifest.appliedMigrations);
-  if (migrationResult.applied.length > 0) {
-    manifest.appliedMigrations.push(...migrationResult.applied);
-    console.log(`  Config   ${migrationResult.applied.length} migration(s) applied`);
-  }
-  if (migrationResult.defaultsFilled.length > 0) {
-    console.log(`  Config   ${migrationResult.defaultsFilled.length} default(s) filled`);
-  }
-
-  // 8. Regenerate derived artifacts (always)
-  const workflowManifestOk = writeManifest(claudeDir);
-  console.log(`  ${workflowManifestOk ? 'Updated' : 'Skipped'}  .claude/config/workflow-manifest.sh`);
-
-  const indexContent = generateIndexMd(projectRoot, claudeDir);
-  fs.writeFileSync(path.join(claudeDir, 'INDEX.md'), indexContent, 'utf8');
-  console.log(`  Updated  .claude/INDEX.md`);
-
-  // 9. Update agent-triggers.json (template-managed)
-  const triggersSrc = path.join(TEMPLATES_DIR, 'config', 'agent-triggers.json');
-  const triggersDest = path.join(claudeDir, 'config', 'agent-triggers.json');
-  if (fs.existsSync(triggersSrc)) {
-    fs.copyFileSync(triggersSrc, triggersDest);
-    console.log(`  Updated  .claude/config/agent-triggers.json`);
-  }
-
-  // 10. Update scope template
-  const scopeTemplateSrc = path.join(TEMPLATES_DIR, 'scopes', '_template.md');
-  const scopeTemplateDest = path.join(projectRoot, 'scopes', '_template.md');
-  if (fs.existsSync(scopeTemplateSrc)) {
-    ensureDir(path.join(projectRoot, 'scopes'));
-    fs.copyFileSync(scopeTemplateSrc, scopeTemplateDest);
-  }
-
-  // 11. Make hook scripts executable
-  chmodScripts(path.join(claudeDir, 'hooks'));
-
-  // 12. Refresh global primitives
-  seedGlobalPrimitives();
-
-  // 13. Update manifest metadata
-  manifest.previousPackageVersion = oldVersion;
-  manifest.packageVersion = newVersion;
-  manifest.updatedAt = new Date().toISOString();
-  saveManifest(projectRoot, manifest);
-
-  // 14. Validate
-  const report = validate(projectRoot, newVersion);
-  if (report.errors > 0) {
-    console.log(`\n  Validation: ${report.errors} errors found`);
-    console.log(formatValidationReport(report));
-  }
-
-  const totalChanges = plan.toAdd.length + plan.toUpdate.length + plan.toRemove.length + plan.toRename.length;
-  console.log(`\nUpdate complete. ${totalChanges} file changes, ${plan.toSkip.length} skipped.\n`);
-}
-
-export interface UninstallOptions {
-  dryRun?: boolean;
-  keepConfig?: boolean;
-}
-
-export function runUninstall(projectRoot: string, options: UninstallOptions = {}): void {
-  const { dryRun = false, keepConfig = false } = options;
-  const claudeDir = path.join(projectRoot, '.claude');
-
-  console.log(`\nOrbital Command — uninstall${dryRun ? ' (dry run)' : ''}`);
-  console.log(`Project root: ${projectRoot}\n`);
-
-  const manifest = loadManifest(projectRoot);
-
-  // Fall back to legacy uninstall if no manifest
-  if (!manifest) {
-    console.log('  No manifest found — falling back to legacy uninstall.');
-    runLegacyUninstall(projectRoot);
-    return;
-  }
-
-  // Compute what to remove vs preserve
-  const toRemove: string[] = [];
-  const toPreserve: string[] = [];
-
-  for (const [filePath, record] of Object.entries(manifest.files)) {
-    if (record.origin === 'user') {
-      toPreserve.push(filePath);
-    } else if (record.status === 'modified' || record.status === 'outdated') {
-      toPreserve.push(filePath);
-    } else {
-      toRemove.push(filePath);
-    }
-  }
-
-  if (dryRun) {
-    console.log('  Files to REMOVE:');
-    for (const f of toRemove) console.log(`    ${f}`);
-    if (toPreserve.length > 0) {
-      console.log('  Files to PRESERVE:');
-      for (const f of toPreserve) console.log(`    ${f} (${manifest.files[f].origin}/${manifest.files[f].status})`);
-    }
-    console.log(`\n  Would also remove: settings hooks, generated artifacts, config files, gitignore entries`);
-    console.log(`  No changes made. Run without --dry-run to apply.`);
-    return;
-  }
-
-  // 1. Remove _orbital hooks from settings.local.json
-  const settingsPath = path.join(claudeDir, 'settings.local.json');
-  const removedHooks = removeAllOrbitalHooks(settingsPath);
-  console.log(`  Removed  ${removedHooks} orbital hook registrations`);
-
-  // 2. Delete template files (synced + pinned, not modified or user-owned)
-  let filesRemoved = 0;
-  for (const filePath of toRemove) {
-    const absPath = path.join(claudeDir, filePath);
-    if (fs.existsSync(absPath)) {
-      fs.unlinkSync(absPath);
-      filesRemoved++;
-    }
-  }
-  console.log(`  Removed  ${filesRemoved} template files`);
-  if (toPreserve.length > 0) {
-    console.log(`  Preserved ${toPreserve.length} user/modified files`);
-  }
-
-  // 3. Clean up empty directories
-  for (const dir of ['hooks', 'skills', 'agents', 'config/workflows', 'quick', 'anti-patterns']) {
-    const dirPath = path.join(claudeDir, dir);
-    if (fs.existsSync(dirPath)) cleanEmptyDirs(dirPath);
-  }
-
-  // 4. Remove generated artifacts
-  for (const artifact of manifest.generatedArtifacts) {
-    const artifactPath = path.join(claudeDir, artifact);
-    if (fs.existsSync(artifactPath)) {
-      fs.unlinkSync(artifactPath);
-      console.log(`  Removed  .claude/${artifact}`);
-    }
-  }
-
-  // 5. Remove template-sourced config files
-  const configFiles = [
-    'config/agent-triggers.json',
-    'config/workflow.json',
-    'lessons-learned.md',
-  ];
-  for (const file of configFiles) {
-    const filePath = path.join(claudeDir, file);
-    if (fs.existsSync(filePath)) {
-      fs.unlinkSync(filePath);
-      console.log(`  Removed  .claude/${file}`);
-    }
-  }
-
-  // Remove config/workflows/ directory entirely
-  const workflowsDir = path.join(claudeDir, 'config', 'workflows');
-  if (fs.existsSync(workflowsDir)) {
-    fs.rmSync(workflowsDir, { recursive: true, force: true });
-    console.log(`  Removed  .claude/config/workflows/`);
-  }
-
-  // 6. Remove gitignore entries
-  removeGitignoreEntries(projectRoot, manifest.gitignoreEntries);
-  console.log(`  Cleaned  .gitignore`);
-
-  // 7. Deregister from global registry
-  if (unregisterProject(projectRoot)) {
-    console.log(`  Removed  project from ~/.orbital/config.json`);
-  }
-
-  // 8. Remove orbital config and manifest (unless --keep-config)
-  if (!keepConfig) {
-    const toClean = ['orbital.config.json', 'orbital-manifest.json', 'orbital-sync.json'];
-    for (const file of toClean) {
-      const filePath = path.join(claudeDir, file);
-      if (fs.existsSync(filePath)) fs.unlinkSync(filePath);
-    }
-
-    // Remove backups directory
-    const backupsDir = path.join(claudeDir, '.orbital-backups');
-    if (fs.existsSync(backupsDir)) fs.rmSync(backupsDir, { recursive: true, force: true });
-
-    console.log(`  Removed  orbital config and manifest`);
-  } else {
-    // Still remove the manifest — it's invalid after uninstall
-    const manifestPath = path.join(claudeDir, 'orbital-manifest.json');
-    if (fs.existsSync(manifestPath)) fs.unlinkSync(manifestPath);
-    console.log(`  Kept     orbital.config.json (--keep-config)`);
-  }
-
-  // Clean up remaining empty directories
-  for (const dir of ['config', 'quick', 'anti-patterns', 'review-verdicts']) {
-    const dirPath = path.join(claudeDir, dir);
-    if (fs.existsSync(dirPath)) cleanEmptyDirs(dirPath);
-  }
-
-  const total = removedHooks + filesRemoved;
-  console.log(`\nUninstall complete. ${total} items removed.`);
-  if (toPreserve.length > 0) {
-    console.log(`Note: ${toPreserve.length} user/modified files were preserved.`);
-  }
-  console.log(`Note: scopes/ and .claude/orbital-events/ were preserved.\n`);
-}
-
-/** Legacy uninstall for projects without a manifest (backward compat). */
-function runLegacyUninstall(projectRoot: string): void {
-  const claudeDir = path.join(projectRoot, '.claude');
-
-  // Remove orbital hooks from settings.local.json
-  const settingsPath = path.join(claudeDir, 'settings.local.json');
-  const removedHooks = removeAllOrbitalHooks(settingsPath);
-  console.log(`  Removed  ${removedHooks} orbital hook registrations`);
-
-  // Delete hooks/skills/agents that match template files
-  for (const dir of ['hooks', 'skills', 'agents']) {
-    const templateFiles = listTemplateFiles(path.join(TEMPLATES_DIR, dir), path.join(claudeDir, dir));
-    let removed = 0;
-    for (const f of templateFiles) {
-      if (fs.existsSync(f)) { fs.unlinkSync(f); removed++; }
-    }
-    const dirPath = path.join(claudeDir, dir);
-    if (fs.existsSync(dirPath)) cleanEmptyDirs(dirPath);
-    console.log(`  Removed  ${removed} ${dir} files`);
-  }
-
-  console.log(`\nLegacy uninstall complete.`);
-  console.log(`Note: scopes/ and .claude/orbital-events/ were preserved.\n`);
-}
-
-/** Remove Orbital-added entries from .gitignore. */
-function removeGitignoreEntries(projectRoot: string, entries: string[]): void {
-  const gitignorePath = path.join(projectRoot, '.gitignore');
-  if (!fs.existsSync(gitignorePath)) return;
-
-  let content = fs.readFileSync(gitignorePath, 'utf-8');
-  const marker = '# Orbital Command';
-
-  // Try to remove the entire block
-  const markerIdx = content.indexOf(marker);
-  if (markerIdx !== -1) {
-    // Find the block boundaries: from the marker to the next non-empty/non-orbital line
-    const before = content.slice(0, markerIdx).replace(/\n+$/, '');
-    const after = content.slice(markerIdx);
-    const lines = after.split('\n');
-    let endIdx = 0;
-    for (let i = 0; i < lines.length; i++) {
-      const line = lines[i].trim();
-      if (i === 0) { endIdx = i + 1; continue; } // skip the marker line
-      if (line === '' || entries.includes(line)) { endIdx = i + 1; continue; }
-      break;
-    }
-    const remaining = lines.slice(endIdx).join('\n');
-    content = before + (remaining ? '\n' + remaining : '') + '\n';
-    fs.writeFileSync(gitignorePath, content, 'utf-8');
-  }
-}
-
-/** Copy a single template file to a destination, resolving the template path. */
-function copyTemplateFile(templatesDir: string, claudeRelPath: string, destPath: string): void {
-  const templateRelPath = reverseRemapPath(claudeRelPath);
-  const srcPath = path.join(templatesDir, templateRelPath);
-  if (!fs.existsSync(srcPath)) {
-    throw new Error(`Template file not found: ${templateRelPath}`);
-  }
-  const destDir = path.dirname(destPath);
-  if (!fs.existsSync(destDir)) fs.mkdirSync(destDir, { recursive: true });
-  safeCopyTemplate(srcPath, destPath);
-}
+// runUpdate and runUninstall have been extracted to update.ts and uninstall.ts
+// and are re-exported above for backward compatibility.

package/server/launch.ts

@@ -1,5 +1,5 @@
 /**
- * Entry point for `orbital launch` — starts the central multi-project server.
+ * Entry point for the central multi-project server.
  *
  * Reads environment variables set by bin/orbital.js:
  *   ORBITAL_LAUNCH_MODE=central

package/server/parsers/event-parser.ts

@@ -46,7 +46,10 @@ export function parseEventFile(filePath: string): RawEvent | null {
       timestamp: String(parsed.timestamp),
     };
   } catch (err) {
-    log.warn('Failed to parse event file', { file: filePath, error: (err as Error).message });
+    const code = (err as NodeJS.ErrnoException).code;
+    if (code !== 'ENOENT') {
+      log.warn('Failed to parse event file', { file: filePath, error: (err as Error).message });
+    }
     return null;
   }
 }

package/server/project-context.ts

@@ -26,7 +26,6 @@ import { startScopeWatcher } from './watchers/scope-watcher.js';
 import { startEventWatcher } from './watchers/event-watcher.js';
 import { resolveStaleDispatches, resolveActiveDispatchesForScope, resolveDispatchesByPid, resolveDispatchesByDispatchId, linkPidToDispatch, tryAutoRevertAndClear } from './utils/dispatch-utils.js';
 import { syncClaudeSessionsToDB } from './services/claude-session-service.js';
-import { TelemetryService } from './services/telemetry-service.js';
 import { ensureDynamicProfiles } from './utils/terminal-launcher.js';
 import { createLogger } from './utils/logger.js';
 
@@ -36,6 +35,11 @@ const log = createLogger('project-context');
 
 export type ProjectStatus = 'active' | 'error' | 'offline';
 
+interface TelemetryEnabled {
+  enabled: boolean;
+  uploadChangedSessions(): Promise<unknown>;
+}
+
 export interface ProjectContext {
   /** Project slug ID (derived from directory name) */
   id: string;
@@ -61,7 +65,8 @@ export interface ProjectContext {
   workflowService: WorkflowService;
   gitService: GitService;
   githubService: GitHubService;
-  telemetryService: TelemetryService;
+  telemetryService: TelemetryEnabled | null;
+  telemetryRouter: import('express').Router | null;
 
   // Watchers
   scopeWatcher: FSWatcher;
@@ -122,8 +127,8 @@ export async function createProjectContext(
   const gateService = new GateService(db, emitter);
   const deployService = new DeployService(db, emitter);
   const sprintService = new SprintService(db, emitter, scopeService);
-  const sprintOrchestrator = new SprintOrchestrator(db, emitter, sprintService, scopeService, workflowEngine, config.projectRoot);
-  const batchOrchestrator = new BatchOrchestrator(db, emitter, sprintService, scopeService, workflowEngine, config.projectRoot);
+  const sprintOrchestrator = new SprintOrchestrator(db, emitter, sprintService, scopeService, workflowEngine, config.projectRoot, config);
+  const batchOrchestrator = new BatchOrchestrator(db, emitter, sprintService, scopeService, workflowEngine, config.projectRoot, config);
   const readinessService = new ReadinessService(scopeService, gateService, workflowEngine, config.projectRoot);
   const workflowService = new WorkflowService(config.configDir, workflowEngine, config.scopesDir, getDefaultConfigPath());
   workflowService.setSocketServer(emitter);
@@ -132,7 +137,17 @@ export async function createProjectContext(
   workflowEngine.reload(workflowService.getActive());
   const gitService = new GitService(config.projectRoot, scopeCache);
   const githubService = new GitHubService(config.projectRoot);
-  const telemetryService = new TelemetryService(db, config.telemetry, config.projectName, config.projectRoot);
+
+  let telemetryService: TelemetryEnabled | null = null;
+  let telemetryRouter: import('express').Router | null = null;
+  const telemetryMod = './services/telemetry-service.js';
+  try {
+    const mod = await import(telemetryMod);
+    telemetryService = new mod.TelemetryService(db, config.telemetry, config.projectName, config.projectRoot);
+    if (telemetryService?.enabled) {
+      telemetryRouter = mod.createTelemetryRoutes({ telemetryService });
+    }
+  } catch { /* telemetry service not installed */ }
 
   // Wire active-group guard
   scopeService.setActiveGroupCheck((scopeId) => sprintService.getActiveGroupForScope(scopeId));
@@ -190,7 +205,7 @@ export async function createProjectContext(
 
   // Wire status change callbacks
   scopeService.onStatusChange((scopeId, newStatus) => {
-    if (newStatus === 'dev') sprintOrchestrator.onScopeReachedDev(scopeId);
+    if (workflowEngine.isTerminalStatus(newStatus)) sprintOrchestrator.onScopeReachedDev(scopeId);
     batchOrchestrator.onScopeStatusChanged(scopeId, newStatus);
   });
   scopeService.onStatusChange((scopeId, newStatus) => {
@@ -220,14 +235,14 @@ export async function createProjectContext(
   if (staleBatchesResolved > 0) log.info('Resolved stale batches', { count: staleBatchesResolved });
 
   // Resolve stale dispatches
-  resolveStaleDispatches(db, emitter, scopeService, workflowEngine);
+  resolveStaleDispatches(db, emitter, scopeService, workflowEngine, config.dispatch.staleTimeoutMinutes);
 
   // Initial session sync + legacy purge (Fix 7)
   syncClaudeSessionsToDB(db, scopeService, config.projectRoot).then((count) => {
     if (count > 0) log.info('Synced sessions', { id: projectId, count });
     const purged = db.prepare("DELETE FROM sessions WHERE action IS NULL AND id LIKE 'claude-%'").run();
     if (purged.changes > 0) log.info('Purged legacy session rows', { count: purged.changes });
-    if (telemetryService.enabled) {
+    if (telemetryService?.enabled) {
       telemetryService.uploadChangedSessions().catch(() => {});
     }
   }).catch(err => log.error('Session sync failed', { error: err.message }));
@@ -245,13 +260,13 @@ export async function createProjectContext(
   }, 30_000));
 
   intervals.push(setInterval(() => {
-    resolveStaleDispatches(db, emitter, scopeService, workflowEngine);
+    resolveStaleDispatches(db, emitter, scopeService, workflowEngine, config.dispatch.staleTimeoutMinutes);
   }, 30_000));
 
   intervals.push(setInterval(async () => {
     const count = await syncClaudeSessionsToDB(db, scopeService, config.projectRoot);
     if (count > 0) emitter.emit('session:updated', { type: 'resync', count });
-    if (telemetryService.enabled) {
+    if (telemetryService?.enabled) {
       telemetryService.uploadChangedSessions().catch(() => {});
     }
   }, 5 * 60_000));
@@ -289,6 +304,7 @@ export async function createProjectContext(
     gitService,
     githubService,
     telemetryService,
+    telemetryRouter,
     scopeWatcher,
     eventWatcher,
     intervals,