@ricsam/r5d-worker 0.0.45 → 0.0.47

package/dist/types/main.d.ts

@@ -1,4 +1,5 @@
 #!/usr/bin/env bun
+import { type WorkspaceProjectManifestEntry } from "./workspace-sync";
 type WorkerReadFileResult = {
     type: "read";
     kind: "text";
@@ -11,6 +12,7 @@ type WorkerReadFileResult = {
     truncated: boolean;
     continuation?: string;
 };
+type WorkerProjectManifestEntry = WorkspaceProjectManifestEntry;
 type WorkerWriteFileResult = {
     type: "write";
     file: string;
@@ -49,6 +51,11 @@ type WorkerViewFileBytesResult = {
     width: number;
     height: number;
 };
+export type WorkerBuiltInToolPaths = {
+    artifactsDir?: string;
+    plansDir?: string;
+    activePlanFile?: string;
+};
 export declare function isArtifactEnvPath(filePath: string): boolean;
 export declare function syncSessionArtifacts(input: {
     baseUrl: string;
@@ -76,6 +83,13 @@ type GitAuth = {
     extraHeaderUrl: string;
     header: string;
 };
+declare function gitAuthArgs(auth?: GitAuth): string[];
+export declare const visibleCheckoutGitTestHarness: {
+    gitAuthArgs: typeof gitAuthArgs;
+    commandArgs: (args: string[], auth?: GitAuth) => string[];
+    cloneArgs: (remoteUrl: string, branchPath: string) => string[];
+    fetchArgs: (...args: string[]) => string[];
+};
 type ResolvedWorkerFilePath = {
     absolutePath: string;
     displayPath: string;
@@ -86,39 +100,73 @@ type ResolvedWorkerFilePath = {
     displayPath: string;
     repoRelativePath: null;
     scope: "host";
+} | {
+    absolutePath: string;
+    displayPath: string;
+    repoRelativePath: null;
+    scope: "virtual";
+    virtualRootPath: string;
+};
+export declare function resolveWorkerFilePath(branchPath: string, inputPath: string, builtInPaths?: WorkerBuiltInToolPaths): ResolvedWorkerFilePath;
+export declare function visibleCheckoutRemoteFor(input: {
+    baseUrl: string;
+    token: string;
+    projectId: string;
+    branchName: string;
+    manifest?: WorkerProjectManifestEntry;
+}): {
+    remoteUrl: string;
+    authHeader: string | null;
+    persistAuth: boolean;
+    reconcileExistingOrigin: boolean;
+    requireRemoteBranch: boolean;
+    requiredBaseCommit: string | null;
 };
-export declare function resolveWorkerFilePath(branchPath: string, inputPath: string): ResolvedWorkerFilePath;
 export declare function githubCliEnv(token: string | null | undefined): Record<string, string>;
 export declare function ensureVisibleGitCheckout(input: {
     projectRoot: string;
     branchName: string;
-    githubRemoteUrl: string;
-    githubAuth?: GitAuth;
-    githubAuthHeader?: string | null;
+    remoteUrl: string;
+    remoteAuth?: GitAuth;
+    persistentAuthHeader?: string | null;
     defaultBranch: string;
     reconcileExistingOrigin?: boolean;
+    requireRemoteBranch?: boolean;
+    requiredBaseCommit?: string | null;
+    allowRequiredRemoteMigration?: boolean;
+    clearPersistentAuth?: boolean;
 }): string;
-export declare function readWorkerTextFile(branchPath: string, filePath: string, offset?: number, limit?: number): WorkerReadFileResult;
-export declare function writeWorkerTextFile(branchPath: string, filePath: string, content: string): WorkerWriteFileResult;
+type VisibleCheckoutTarget = {
+    projectId: string;
+    branchName: string;
+};
+export declare function workspaceSyncCheckoutTargets(input: {
+    projects: readonly WorkspaceProjectManifestEntry[];
+    pendingTargets: readonly VisibleCheckoutTarget[];
+    includeAllManifestCheckouts: boolean;
+    canonicalCheckoutOnly?: VisibleCheckoutTarget;
+}): VisibleCheckoutTarget[];
+export declare function readWorkerTextFile(branchPath: string, filePath: string, offset?: number, limit?: number, builtInPaths?: WorkerBuiltInToolPaths): WorkerReadFileResult;
+export declare function writeWorkerTextFile(branchPath: string, filePath: string, content: string, builtInPaths?: WorkerBuiltInToolPaths): WorkerWriteFileResult;
 export declare function editWorkerTextFile(branchPath: string, filePath: string, edits: Array<{
     oldText: string;
     newText: string;
-}>): WorkerEditFileResult;
+}>, builtInPaths?: WorkerBuiltInToolPaths): WorkerEditFileResult;
 export declare function grepWorkerFiles(branchPath: string, input: {
     pattern: string;
     path?: string;
     glob?: string;
     caseSensitive?: boolean;
     limit?: number;
-}): WorkerGrepResult;
+}, builtInPaths?: WorkerBuiltInToolPaths): WorkerGrepResult;
 export declare function findWorkerFiles(branchPath: string, input: {
     pattern?: string;
     path?: string;
     entryType?: string;
     limit?: number;
-}): WorkerFindResult;
-export declare function listWorkerDirectory(branchPath: string, inputPath?: string, inputLimit?: number): WorkerLsResult;
-export declare function readWorkerImageFile(branchPath: string, filePath: string): WorkerViewFileBytesResult;
+}, builtInPaths?: WorkerBuiltInToolPaths): WorkerFindResult;
+export declare function listWorkerDirectory(branchPath: string, inputPath?: string, inputLimit?: number, builtInPaths?: WorkerBuiltInToolPaths): WorkerLsResult;
+export declare function readWorkerImageFile(branchPath: string, filePath: string, builtInPaths?: WorkerBuiltInToolPaths): WorkerViewFileBytesResult;
 export declare function resolveHostShell(command?: string, platform?: NodeJS.Platform): {
     file: string;
     args: string[];

package/dist/types/workspace-sync.d.ts

@@ -10,6 +10,10 @@ export type WorkspaceProjectManifestEntry = {
     repoAuthHeader: string | null;
     defaultBranch: string;
     branches: string[];
+    canonicalCheckouts: Array<{
+        branchName: string;
+        scaffoldCommitHash: string;
+    }>;
 };
 export type WorkspaceSyncTrigger = {
     type: "connect" | "inbound_head" | "write" | "edit" | "shell_inline" | "process_terminal" | "process_cancel" | "periodic" | "manual" | "remediation" | "remediation_confirm" | "remediation_reset";
@@ -18,6 +22,12 @@ export type WorkspaceSyncTrigger = {
     toolCallId?: string;
     projectId?: string;
     branchName?: string;
+    /**
+     * Restricts this synchronization to the exact canonical resolver checkout
+     * identified by projectId/branchName. Ordinary synchronization never reads
+     * or writes canonical resolver checkout subtrees.
+     */
+    canonicalCheckoutOnly?: boolean;
     detail?: string;
 };
 export type WorkspaceSyncOutcome = "no_change" | "published" | "updated" | "conflict_reset" | "large_diff_blocked" | "reset" | "failed";
@@ -37,6 +47,7 @@ export type WorkspaceSyncResult = {
     affectedPaths: string[];
     discardedPaths: string[];
     localChangesDiscarded: boolean;
+    sampledCanonicalCheckoutTreeHash?: string;
     error?: string;
 };
 export type WorkspaceSyncInput = {
@@ -59,16 +70,35 @@ export type WorkspaceSyncInput = {
     }>;
 };
 export declare function encodeWorkspaceBranch(branchName: string): string;
+/**
+ * Treat canonical resolver checkouts as a separate synchronization authority.
+ * Generic workspace scans omit them; an explicitly scoped request contains
+ * exactly one resolver checkout and no sibling branches.
+ */
+export declare function workspaceProjectsForSync(projects: readonly WorkspaceProjectManifestEntry[], trigger: WorkspaceSyncTrigger): WorkspaceProjectManifestEntry[];
 export declare function workspaceProjectBranchRelativePath(projectId: string, branchName: string): string;
 export declare function workspacePlansRelativePath(projectId: string, branchName: string): string;
 export declare function visibleProjectBranchPath(projectsRoot: string, manifest: WorkspaceProjectManifestEntry, branchName: string): string;
-export declare function mirrorVisibleWorkspaceToShadow(input: WorkspaceSyncInput, excludedCheckouts?: ReadonlySet<string>): void;
-export declare function mirrorShadowWorkspaceToVisible(input: WorkspaceSyncInput): void;
+type GitlinkEntry = {
+    filePath: string;
+    objectId: string;
+};
+type GitlinkProjection = {
+    entries: GitlinkEntry[];
+    opaqueRoots: string[];
+};
+export declare function assertCanonicalCheckoutIndexMatchesWorktree(checkoutPath: string): void;
+export declare function mirrorVisibleWorkspaceToShadow(input: WorkspaceSyncInput, excludedCheckouts?: ReadonlySet<string>): GitlinkProjection;
+export declare function mirrorShadowWorkspaceToVisible(input: WorkspaceSyncInput, opaqueWorkspaceRoots?: readonly string[]): void;
 export declare function synchronizeWorkspace(rawInput: WorkspaceSyncInput): Promise<WorkspaceSyncResult>;
-export declare function calculateWorkspaceDiffFingerprint(input: WorkspaceSyncInput): string;
+export declare function calculateWorkspaceDiffFingerprint(rawInput: WorkspaceSyncInput): string;
 export declare class WorkspaceSyncSingleFlight {
     private queue;
+    private enqueue;
     run(input: WorkspaceSyncInput): Promise<WorkspaceSyncResult>;
+    runPrepared(prepare: () => WorkspaceSyncInput): Promise<WorkspaceSyncResult>;
     fingerprint(input: WorkspaceSyncInput): Promise<string>;
+    fingerprintPrepared(prepare: () => WorkspaceSyncInput): Promise<string>;
     afterCurrent(): Promise<void>;
 }
+export {};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ricsam/r5d-worker",
-  "version": "0.0.45",
+  "version": "0.0.47",
   "type": "module",
   "main": "./dist/cjs/main.cjs",
   "module": "./dist/mjs/main.mjs",