@moretea-labs/forge 1.8.0 → 1.8.2

package/packages/protocols/computer/contract.ts

@@ -114,7 +114,33 @@ export interface ComputerConsoleUnlockRequest {
   credentialHandle: string;
 }
 
-export type ComputerConsoleUnlockCommandRequest = ComputerConsoleUnlockPrepareRequest | ComputerConsoleUnlockRequest;
+export interface ComputerConsoleUnlockEnrollRequest {
+  capability: typeof COMPUTER_CONSOLE_UNLOCK_CAPABILITY;
+  action: 'console_unlock_enroll';
+}
+
+export interface ComputerConsoleUnlockStatusRequest {
+  capability: typeof COMPUTER_CONSOLE_UNLOCK_CAPABILITY;
+  action: 'console_unlock_status';
+}
+
+export interface ComputerConsoleUnlockRecoverRequest {
+  capability: typeof COMPUTER_CONSOLE_UNLOCK_CAPABILITY;
+  action: 'console_unlock_recover';
+}
+
+export interface ComputerConsoleUnlockRevokeRequest {
+  capability: typeof COMPUTER_CONSOLE_UNLOCK_CAPABILITY;
+  action: 'console_unlock_revoke';
+}
+
+export type ComputerConsoleUnlockCommandRequest =
+  | ComputerConsoleUnlockPrepareRequest
+  | ComputerConsoleUnlockRequest
+  | ComputerConsoleUnlockEnrollRequest
+  | ComputerConsoleUnlockStatusRequest
+  | ComputerConsoleUnlockRecoverRequest
+  | ComputerConsoleUnlockRevokeRequest;
 
 export interface ComputerConsoleUnlockAuthorization {
   kind: 'explicit_single_use';

package/scripts/activate-source-baseline.ts

@@ -6,13 +6,13 @@ import {
   existsSync,
   mkdirSync,
   openSync,
-  readFileSync,
   renameSync,
   writeFileSync,
 } from 'fs';
 import { dirname, join, resolve } from 'path';
 import { fileURLToPath } from 'url';
 import { resolveRepoPreferredControllerHome } from '../src/cli/repositories/controller-home';
+import { findRegisteredRepositoryByCheckoutRoot } from '../src/cli/repositories/registry';
 import { cleanupTerminalWork } from '../src/runtime/control-plane/execution/work-terminal-cleanup';
 import { listWorkHandles, type WorkTerminalOutcome } from '../src/runtime/control-plane/execution/work-handle-store';
 import { runProcess } from '../src/effects/process-runner';
@@ -114,13 +114,12 @@ function assertCleanMain(repoRoot: string, expectedHead?: string): string {
   return head;
 }
 
-function repositoryId(repoRoot: string): string {
-  const configPath = join(repoRoot, '.ai', 'harness', 'repository.json');
-  const parsed = JSON.parse(readFileSync(configPath, 'utf8')) as { repoId?: unknown };
-  if (typeof parsed.repoId !== 'string' || !parsed.repoId.trim()) {
+function repositoryId(repoRoot: string, controllerHome: string): string {
+  const repository = findRegisteredRepositoryByCheckoutRoot(repoRoot, controllerHome);
+  if (!repository?.repoId?.trim()) {
     throw new Error('SOURCE_BASELINE_REPOSITORY_ID_UNAVAILABLE');
   }
-  return parsed.repoId.trim();
+  return repository.repoId.trim();
 }
 
 function statePath(controllerHome: string, requestId: string): string {
@@ -194,7 +193,7 @@ async function request(args: string[]): Promise<void> {
   const controllerHome = resolveRepoPreferredControllerHome(repoRoot, option(args, '--controller-home'));
   const requestId = safeId(option(args, '--request-id'));
   const expectedHead = assertCleanMain(repoRoot, option(args, '--expected-head'));
-  const repoId = repositoryId(repoRoot);
+  const repoId = repositoryId(repoRoot, controllerHome);
   const requestedAt = new Date().toISOString();
   let state: SourceBaselineState = {
     schemaVersion: 1,
@@ -251,7 +250,7 @@ async function run(args: string[]): Promise<void> {
   const requestId = safeId(option(args, '--request-id'));
   const expectedHead = option(args, '--expected-head');
   if (!expectedHead) throw new Error('SOURCE_BASELINE_EXPECTED_HEAD_REQUIRED');
-  const repoId = repositoryId(repoRoot);
+  const repoId = repositoryId(repoRoot, controllerHome);
   const requestedAt = new Date().toISOString();
   let state: SourceBaselineState = {
     schemaVersion: 1,
@@ -301,7 +300,6 @@ async function run(args: string[]): Promise<void> {
       const result = await cleanupTerminalWork({
         controllerHome,
         handle,
-        targetBranch: 'main',
         deleteBranch: true,
         terminalOutcome: terminalOutcome(handle),
         failureReason: handle.failureReason ?? 'source baseline terminal cleanup reconciliation',

package/scripts/assemble-template.ts

@@ -9,7 +9,6 @@
 import { readFileSync, existsSync, readdirSync } from "fs";
 import { join, dirname } from "path";
 import { fileURLToPath } from "url";
-import { runHooks } from "./run-skill-hook";
 
 // ============================================================================
 // Types
@@ -64,23 +63,6 @@ export interface PlanMap {
   plans: Record<string, PlanConfig>;
 }
 
-export interface SkillVersionManifest {
-  version: string;
-  templateVersion: string;
-  compatibility: {
-    minClaudeCodeVersion: string;
-    minBunVersion: string;
-  };
-  breakingChanges: Array<{
-    version: string;
-    description: string;
-  }>;
-  generatedProjectStamp: {
-    format: string;
-    location: string;
-  };
-}
-
 interface RuntimeProfileConfig {
   label: string;
   claudePolicy: string;
@@ -134,7 +116,6 @@ const ASSETS_DIR = join(REPO_ROOT, "assets");
 const PARTIALS_DIR = join(ASSETS_DIR, "partials");
 const PARTIALS_AGENTS_DIR = join(ASSETS_DIR, "partials-agents");
 const VERSIONS_FILE = join(ASSETS_DIR, "versions.json");
-const SKILL_VERSION_FILE = join(ASSETS_DIR, "skill-version.json");
 const PLAN_MAP_FILE = join(ASSETS_DIR, "plan-map.json");
 const QUESTION_PACK_FILE = join(ASSETS_DIR, "initializer-question-pack.v4.json");
 
@@ -276,31 +257,14 @@ export function loadVersions(versionsFilePath: string = VERSIONS_FILE): Record<s
   return versions;
 }
 
-/**
- * Load skill version manifest from skill-version.json.
- */
-export function loadSkillVersion(
-  skillVersionFilePath: string = SKILL_VERSION_FILE
-): SkillVersionManifest {
-  if (!existsSync(skillVersionFilePath)) {
-    throw new Error(`skill-version.json not found at ${skillVersionFilePath}`);
-  }
-
-  let parsed: unknown;
-  try {
-    parsed = JSON.parse(readFileSync(skillVersionFilePath, "utf-8"));
-  } catch (error) {
-    throw new Error(
-      `Failed to parse skill-version.json: ${error instanceof Error ? error.message : String(error)}`
-    );
-  }
-
-  const manifest = parsed as SkillVersionManifest;
-  if (!manifest.version || !manifest.templateVersion) {
-    throw new Error("skill-version.json missing required version or templateVersion field");
+/** Read the Forge release version from its single canonical package manifest. */
+export function loadForgeVersion(): string {
+  const pkgPath = join(ASSETS_DIR, "..", "package.json");
+  const pkg = JSON.parse(readFileSync(pkgPath, "utf-8")) as { version?: string };
+  if (typeof pkg.version !== "string" || !/^\d+\.\d+\.\d+(?:-[0-9A-Za-z.-]+)?$/.test(pkg.version)) {
+    throw new Error("Invalid Forge package version in " + pkgPath);
   }
-
-  return manifest;
+  return pkg.version;
 }
 
 /**
@@ -935,7 +899,7 @@ export function assembleTemplate(options: AssemblyOptions): string {
 
   // Load version variables
   const versions = loadVersions();
-  const skillVersion = loadSkillVersion();
+  const forgeVersion = loadForgeVersion();
 
   // Merge all variables (user variables take precedence)
   const mergedVariables: Record<string, string> = {
@@ -943,8 +907,8 @@ export function assembleTemplate(options: AssemblyOptions): string {
     ...getDefaultTemplateVariables(resolvedPlanType, planMap, quickMode),
     ...variables,
     PLAN_TYPE: resolvedPlanType,
-    SKILL_VERSION: skillVersion.version,
-    TEMPLATE_VERSION: skillVersion.templateVersion,
+    FORGE_VERSION: forgeVersion,
+    TEMPLATE_VERSION: forgeVersion,
   };
 
   const webappRenderingModel = getWebappRenderingTemplateVariables(
@@ -1017,31 +981,6 @@ export function assembleTemplate(options: AssemblyOptions): string {
   return assembled;
 }
 
-/**
- * Async wrapper that runs lifecycle hooks around assembleTemplate().
- * Use this from CLI or scripts that support async. Tests can use sync assembleTemplate().
- */
-export async function assembleTemplateWithHooks(options: AssemblyOptions): Promise<string> {
-  const hookContext = {
-    planType: options.planType,
-    target: options.target ?? "claude",
-    quickMode: options.quickMode ?? false,
-  };
-
-  // Pre-assemble hook (sync — failure aborts)
-  const preResult = await runHooks("pre-assemble", hookContext);
-  if (!preResult.success) {
-    throw new Error("pre-assemble hook failed, aborting assembly");
-  }
-
-  const output = assembleTemplate(options);
-
-  // Post-assemble hook (advisory — failure is warning only)
-  await runHooks("post-assemble", { ...hookContext, outputLength: output.length });
-
-  return output;
-}
-
 // ============================================================================
 // CLI
 // ============================================================================
@@ -1163,7 +1102,7 @@ if (import.meta.main) {
       cloudflareNative: parsed.cloudflare,
     };
 
-    const output = await assembleTemplateWithHooks(options);
+    const output = assembleTemplate(options);
     console.log(output);
   } catch (error) {
     console.error("Error:", error instanceof Error ? error.message : error);

package/scripts/canary-controller-semantic-wait.ts

@@ -15,11 +15,9 @@ import {
   getControllerRoundRelay,
   readControllerRoundSemanticStateFingerprint,
   submitControllerRoundDisposition,
-} from '../src/runtime/control-plane/facade/controller-round-relay';
-import { bindControllerSessionBinding } from '../packages/kernel/controller/api/index';
-import { resumeScheduledControllerContinuation } from '../packages/kernel/scheduler/api/index';
+} from '../packages/kernel/controller/api/index';
+import { bindControllerSessionBinding, resumeControllerRoundOccurrence } from '../packages/kernel/controller/api/index';
 import { upsertChatgptControllerBinding } from '../adapters/chatgpt/controller-binding-store';
-import { createWorkContinuationSchedule } from '../src/runtime/workflow/schedules/work-continuation';
 
 const root = mkdtempSync(join(tmpdir(), 'forge-stage3c-semantic-wait-canary-'));
 const controllerHome = join(root, 'controller');
@@ -59,15 +57,14 @@ try {
     repoId: repository.repoId,
     requirementId,
     checkoutId: repository.activeCheckoutId,
-    mode: 'goal_workloop',
     objective: 'Prove semantic wait admission before provider dispatch.',
     acceptanceCriteria: ['Unchanged semantic state stays quiescent.', 'One meaningful state change wakes one successor.'],
     allowedPaths: [],
     forbiddenPaths: [],
     checks: [],
-    constraints: { requireHandoffOnAmbiguity: true },
+    constraints: {},
     requestedBy: 'chatgpt',
-    status: 'ready',
+    phase: 'verification',
   });
 
   const owner = claimControllerSession(store, {
@@ -88,13 +85,6 @@ try {
     tabPolicy: 'auto',
   });
   bindControllerSessionBinding(store, { workId, sessionId: owner.sessionId, binding: adapter.binding });
-  const { schedule } = createWorkContinuationSchedule(controllerHome, repository.repoId, {
-    workId,
-    scheduleMode: 'continuation',
-    controllerType: 'chatgpt',
-    triggerType: 'manual',
-    shadowMode: false,
-  });
   const relayScopeId = `requirement:${requirementId}`;
   beginInitialControllerRoundDispatch(store, {
     workId,
@@ -146,29 +136,27 @@ try {
       return { accepted: true, dispatchId: `stage3c-canary-provider-${providerCalls}` };
     },
   };
-  const unchanged = await resumeScheduledControllerContinuation(store, {
-    scheduleId: schedule.scheduleId,
+  const unchanged = await resumeControllerRoundOccurrence(store, {
     occurrenceId: 'stage3c-canary-unchanged',
     workId,
     controllerBindingId: adapter.binding.bindingId,
     relayScopeId,
   }, host);
-  if (unchanged.dispatch.status !== 'semantic_wait' || providerCallCount() !== 0) {
-    throw new Error(`CANARY_UNCHANGED_WAIT_DISPATCHED:${unchanged.dispatch.status}:calls=${providerCallCount()}`);
+  if (unchanged.outcome !== 'semantic_wait' || providerCallCount() !== 0) {
+    throw new Error(`CANARY_UNCHANGED_WAIT_DISPATCHED:${unchanged.outcome}:calls=${providerCallCount()}`);
   }
 
   recordWorkEvidenceState(store, workId, 'partial');
   const changedFingerprint = readControllerRoundSemanticStateFingerprint(store, workId);
   if (!changedFingerprint || changedFingerprint === baselineFingerprint) throw new Error('CANARY_MEANINGFUL_CHANGE_NOT_DETECTED');
-  const changed = await resumeScheduledControllerContinuation(store, {
-    scheduleId: schedule.scheduleId,
+  const changed = await resumeControllerRoundOccurrence(store, {
     occurrenceId: 'stage3c-canary-changed',
     workId,
     controllerBindingId: adapter.binding.bindingId,
     relayScopeId,
   }, host);
-  if (changed.dispatch.status !== 'dispatched' || providerCallCount() !== 1) {
-    throw new Error(`CANARY_CHANGED_STATE_DISPATCH_COUNT:${changed.dispatch.status}:calls=${providerCallCount()}`);
+  if (changed.outcome !== 'dispatched' || providerCallCount() !== 1) {
+    throw new Error(`CANARY_CHANGED_STATE_DISPATCH_COUNT:${changed.outcome}:calls=${providerCallCount()}`);
   }
   const finalRelay = getControllerRoundRelay(store, workId);
   if (finalRelay?.providerDispatchReceiptId !== 'stage3c-canary-provider-1') {
@@ -185,8 +173,8 @@ try {
     baselineFingerprint,
     timestampChurnFingerprint,
     changedFingerprint,
-    unchangedDispatchStatus: unchanged.dispatch.status,
-    changedDispatchStatus: changed.dispatch.status,
+    unchangedDispatchStatus: unchanged.outcome,
+    changedDispatchStatus: changed.outcome,
     providerCalls: providerCallCount(),
     providerDispatchReceiptId: finalRelay.providerDispatchReceiptId,
   }, null, 2));