@software-dlc/cli 0.157.2

package/dist/local/workspace-upstream-runtime.d.ts

@@ -0,0 +1,91 @@
+import { materializeGraphProjection } from './projection.js';
+import { LocalWorkspaceAuthorityGuard } from './workspace-authority-guard.js';
+import { LocalWorkspaceCommitResolver } from './workspace-commit-resolver.js';
+import type { LocalBranchIntegrationAttempt, LocalBranchIntegrationRevertAttempt, LocalBranchIntegrationResolutionAttempt, LocalWorkspaceCommit } from './workspace-history-types.js';
+import { type LocalGraphMergeResult } from './workspace-merge.js';
+import { type LocalConflictResolutionBudget, type LocalConflictResolver } from './workspace-resolution.js';
+import { LocalWorkspaceStore } from './workspace-store.js';
+import { type LocalUpstreamIntegrationStatus } from './workspace-upstream-inspection.js';
+type UpstreamIntegrationBase = {
+    version: 1;
+    local_ref: string;
+    tracking_ref: string;
+    previous_local_commit_id: string;
+    upstream_commit_id: string;
+    attempt: LocalBranchIntegrationAttempt;
+};
+export type LocalUpstreamIntegrationResult = (UpstreamIntegrationBase & {
+    status: 'already_integrated' | 'fast_forwarded';
+    head_commit_id: string;
+}) | (UpstreamIntegrationBase & {
+    status: 'merged';
+    commit: LocalWorkspaceCommit;
+}) | (UpstreamIntegrationBase & {
+    status: 'blocked_conflict' | 'blocked_validation';
+    merge_result: LocalGraphMergeResult;
+    candidate_commit_id: string | null;
+}) | (UpstreamIntegrationBase & {
+    status: 'stale_head';
+    current_local_commit_id: string;
+    current_upstream_commit_id: string | null;
+    candidate_commit_id: string | null;
+}) | (UpstreamIntegrationBase & {
+    status: 'integrated_recovery_required';
+    integration_status: 'fast_forwarded' | 'merged';
+    head_commit_id: string;
+    head_root_hash: string;
+    previous_projection_root_hash: string | null;
+    projection_error: string;
+});
+export type LocalUpstreamRevertResult = {
+    version: 1;
+    status: 'reverted';
+    integration_attempt: LocalBranchIntegrationAttempt;
+    revert_attempt: LocalBranchIntegrationRevertAttempt;
+    commit: LocalWorkspaceCommit;
+} | {
+    version: 1;
+    status: 'stale_head';
+    integration_attempt: LocalBranchIntegrationAttempt;
+    revert_attempt: LocalBranchIntegrationRevertAttempt;
+    current_head_commit_id: string;
+} | {
+    version: 1;
+    status: 'reverted_recovery_required';
+    integration_attempt: LocalBranchIntegrationAttempt;
+    revert_attempt: LocalBranchIntegrationRevertAttempt;
+    commit: LocalWorkspaceCommit;
+    head_root_hash: string;
+    previous_projection_root_hash: string | null;
+    projection_error: string;
+};
+export declare class LocalWorkspaceUpstreamRuntime {
+    private readonly store;
+    private readonly authority;
+    private readonly commits;
+    private readonly materialize_projection;
+    private readonly inspection;
+    constructor(store: LocalWorkspaceStore, authority: LocalWorkspaceAuthorityGuard, commits: LocalWorkspaceCommitResolver, materialize_projection: typeof materializeGraphProjection);
+    listAttempts(local_ref?: string): LocalBranchIntegrationAttempt[];
+    listResolutionAttempts(attempt_id: string): LocalBranchIntegrationResolutionAttempt[];
+    listRevertAttempts(local_ref?: string): LocalBranchIntegrationRevertAttempt[];
+    inspect(input: {
+        actor_workspace_id: string;
+    }): Promise<LocalUpstreamIntegrationStatus>;
+    revert(input: {
+        actor_workspace_id: string;
+        branch_integration_attempt_id: string;
+        message?: string;
+    }): Promise<LocalUpstreamRevertResult>;
+    integrate(input: {
+        actor_workspace_id: string;
+        conflict_resolver?: LocalConflictResolver;
+        resolution_budget?: LocalConflictResolutionBudget;
+        allow_network_resolver?: boolean;
+    }): Promise<LocalUpstreamIntegrationResult>;
+    private requireUpstreamBinding;
+    private assertProjectionClean;
+    private projectionRoot;
+}
+export {};
+//# sourceMappingURL=workspace-upstream-runtime.d.ts.map

package/dist/local/workspace-upstream-runtime.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-upstream-runtime.d.ts","sourceRoot":"","sources":["../../src/local/workspace-upstream-runtime.ts"],"names":[],"mappings":"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"}

package/dist/local/workspace-upstream-runtime.js

@@ -0,0 +1,270 @@
+import { composeGraphProjection, validateProjectionGraph } from './projection.js';
+import { localGraphRootHash } from './workspace-graph-store.js';
+import { withWorkspaceOperationLock } from './workspace-lock.js';
+import { mergeLocalPortableGraphs } from './workspace-merge.js';
+import { workspaceControlDirectory, workspaceProjectionDirectory } from './workspace-paths.js';
+import { resolveLocalGraphConflicts } from './workspace-resolution.js';
+import { LocalWorkspaceUpstreamInspection } from './workspace-upstream-inspection.js';
+export class LocalWorkspaceUpstreamRuntime {
+    store;
+    authority;
+    commits;
+    materialize_projection;
+    inspection;
+    constructor(store, authority, commits, materialize_projection) {
+        this.store = store;
+        this.authority = authority;
+        this.commits = commits;
+        this.materialize_projection = materialize_projection;
+        this.inspection = new LocalWorkspaceUpstreamInspection(store, authority, commits);
+    }
+    listAttempts(local_ref) {
+        return this.store.history.upstream.listAttempts(local_ref);
+    }
+    listResolutionAttempts(attempt_id) {
+        return this.store.history.upstream.listResolutionAttempts(attempt_id);
+    }
+    listRevertAttempts(local_ref) {
+        return this.store.history.upstream.listRevertAttempts(local_ref);
+    }
+    async inspect(input) {
+        return this.inspection.inspect(input);
+    }
+    async revert(input) {
+        const { workspace } = await this.authority.requireCurrent(input.actor_workspace_id, { require_human: true });
+        return withWorkspaceOperationLock({
+            control_dir: workspaceControlDirectory(workspace),
+            operation: 'revert-upstream',
+            run: async () => {
+                const { workspace: current } = await this.authority.requireCurrent(workspace.id, { require_human: true });
+                await this.assertProjectionClean(current);
+                const integration = this.store.history.upstream.getAttempt(input.branch_integration_attempt_id);
+                if (!integration) {
+                    throw new Error('Branch integration attempt was not found.');
+                }
+                const target_graph = await this.commits.readGraph(integration.expected_local_commit_id);
+                const validation = validateProjectionGraph(target_graph);
+                const issues = validation.issues.filter((issue) => issue.status === 'broken');
+                if (issues.length > 0) {
+                    throw new Error(`Cannot revert to invalid graph: ${issues
+                        .map((issue) => `${issue.code}: ${issue.message}`)
+                        .join('; ')}`);
+                }
+                const previous_projection_root_hash = await this.projectionRoot(current);
+                const stored = this.store.history.upstream.revert({
+                    actor_workspace_id: current.id,
+                    branch_integration_attempt_id: integration.id,
+                    target_root_hash: this.commits.root(integration.expected_local_commit_id),
+                    message: input.message,
+                    validation_evidence: ['complete graph validation passed']
+                });
+                if (stored.status === 'stale_head') {
+                    return {
+                        version: 1,
+                        status: 'stale_head',
+                        integration_attempt: integration,
+                        revert_attempt: stored.attempt,
+                        current_head_commit_id: stored.current_head_commit_id
+                    };
+                }
+                try {
+                    await this.materialize_projection({
+                        projection_dir: workspaceProjectionDirectory(current),
+                        graph: target_graph
+                    });
+                }
+                catch (error) {
+                    return {
+                        version: 1,
+                        status: 'reverted_recovery_required',
+                        integration_attempt: integration,
+                        revert_attempt: stored.attempt,
+                        commit: stored.commit,
+                        head_root_hash: stored.commit.root_hash,
+                        previous_projection_root_hash,
+                        projection_error: error instanceof Error
+                            ? error.message
+                            : 'Projection materialization failed.'
+                    };
+                }
+                return {
+                    version: 1,
+                    status: 'reverted',
+                    integration_attempt: integration,
+                    revert_attempt: stored.attempt,
+                    commit: stored.commit
+                };
+            }
+        });
+    }
+    async integrate(input) {
+        const { workspace } = await this.authority.requireCurrent(input.actor_workspace_id, { require_human: true });
+        return withWorkspaceOperationLock({
+            control_dir: workspaceControlDirectory(workspace),
+            operation: 'merge-upstream',
+            run: async () => {
+                const { workspace: current } = await this.authority.requireCurrent(workspace.id, { require_human: true });
+                await this.assertProjectionClean(current);
+                const binding = this.requireUpstreamBinding(current);
+                const relation = this.commits.compare(binding.local_commit_id, binding.upstream_commit_id);
+                if (relation.relation === 'unrelated') {
+                    throw new Error('Local and upstream histories are unrelated; refusing automatic merge.');
+                }
+                const mode = relation.relation === 'current' || relation.relation === 'ahead'
+                    ? 'already_integrated'
+                    : relation.relation === 'behind'
+                        ? 'fast_forward'
+                        : 'merge';
+                const merge_base_commit_id = mode === 'fast_forward'
+                    ? binding.local_commit_id
+                    : mode === 'already_integrated'
+                        ? binding.upstream_commit_id
+                        : this.commits.findMergeBase(binding.local_commit_id, binding.upstream_commit_id);
+                const base_graph = await this.commits.readGraph(merge_base_commit_id);
+                const local_graph = await this.commits.readGraph(binding.local_commit_id);
+                const upstream_graph = await this.commits.readGraph(binding.upstream_commit_id);
+                let merge_result = mergeLocalPortableGraphs({
+                    base_graph,
+                    coordinator_graph: local_graph,
+                    child_graph: upstream_graph
+                });
+                let resolution_attempts = [];
+                if (merge_result.status === 'blocked_conflict' &&
+                    input.conflict_resolver) {
+                    const resolution = await resolveLocalGraphConflicts({
+                        base_graph,
+                        coordinator_graph: local_graph,
+                        child_graph: upstream_graph,
+                        merge_result,
+                        task_scope: null,
+                        resolver: input.conflict_resolver,
+                        budget: input.resolution_budget,
+                        allow_network_resolver: input.allow_network_resolver,
+                        persist_candidate_graph: (graph) => this.commits.writeGraph(graph)
+                    });
+                    resolution_attempts = resolution.attempts;
+                    if (resolution.status !== 'blocked_conflict') {
+                        merge_result = resolution.merge_result;
+                    }
+                }
+                if (merge_result.status !== 'blocked_conflict') {
+                    await this.commits.writeGraph(merge_result.graph);
+                }
+                const previous_projection_root_hash = await this.projectionRoot(current);
+                const stored = this.store.history.upstream.integrate({
+                    actor_workspace_id: current.id,
+                    local_ref: binding.local_ref,
+                    remote_name: binding.remote_name,
+                    source_ref: binding.source_ref,
+                    tracking_ref: binding.tracking_ref,
+                    expected_local_commit_id: binding.local_commit_id,
+                    expected_upstream_commit_id: binding.upstream_commit_id,
+                    merge_base_commit_id,
+                    mode,
+                    merge_result,
+                    resolution_attempts,
+                    validation_evidence: resolution_attempts.length > 0
+                        ? [
+                            'complete graph validation passed',
+                            'bounded conflict resolution firewall passed'
+                        ]
+                        : ['complete graph validation passed']
+                });
+                const common = {
+                    version: 1,
+                    local_ref: binding.local_ref,
+                    tracking_ref: binding.tracking_ref,
+                    previous_local_commit_id: binding.local_commit_id,
+                    upstream_commit_id: binding.upstream_commit_id,
+                    attempt: stored.attempt
+                };
+                if (stored.status === 'blocked_conflict' ||
+                    stored.status === 'blocked_validation') {
+                    return {
+                        ...common,
+                        status: stored.status,
+                        merge_result,
+                        candidate_commit_id: stored.candidate_commit_id
+                    };
+                }
+                if (stored.status === 'stale_head') {
+                    return { ...common, ...stored };
+                }
+                if (stored.status === 'already_integrated') {
+                    return { ...common, ...stored };
+                }
+                const head_commit_id = stored.status === 'merged' ? stored.commit.id : stored.head_commit_id;
+                if (merge_result.status !== 'clean') {
+                    throw new Error('Integrated upstream result did not retain a clean graph.');
+                }
+                try {
+                    await this.materialize_projection({
+                        projection_dir: workspaceProjectionDirectory(current),
+                        graph: merge_result.graph
+                    });
+                }
+                catch (error) {
+                    return {
+                        ...common,
+                        status: 'integrated_recovery_required',
+                        integration_status: stored.status,
+                        head_commit_id,
+                        head_root_hash: merge_result.root_hash,
+                        previous_projection_root_hash,
+                        projection_error: error instanceof Error
+                            ? error.message
+                            : 'Projection materialization failed.'
+                    };
+                }
+                return { ...common, ...stored };
+            }
+        });
+    }
+    requireUpstreamBinding(workspace) {
+        if (!workspace.attached_ref) {
+            throw new Error('The current workspace is not attached to a local branch.');
+        }
+        const association = this.store.getBranchAssociation(workspace.attached_ref);
+        const local = this.store.getRef(workspace.attached_ref);
+        if (!association || !local) {
+            throw new Error('The current local branch association is unavailable.');
+        }
+        const { upstream_remote_name, upstream_source_ref, upstream_tracking_ref } = association;
+        if (!upstream_remote_name ||
+            !upstream_source_ref ||
+            !upstream_tracking_ref) {
+            throw new Error('The current local branch has no configured upstream.');
+        }
+        const upstream = this.store.remote_tracking.getRef(upstream_remote_name, upstream_source_ref);
+        if (!upstream || upstream.tracking_ref !== upstream_tracking_ref) {
+            throw new Error('The current local branch upstream is gone. Fetch or rebind it.');
+        }
+        if (workspace.head_sdlc_commit_id !== local.head_commit_id) {
+            throw new Error('Attached local branch and workspace head disagree.');
+        }
+        return {
+            local_ref: local.ref_name,
+            local_commit_id: local.head_commit_id,
+            remote_name: upstream_remote_name,
+            source_ref: upstream_source_ref,
+            tracking_ref: upstream_tracking_ref,
+            upstream_commit_id: upstream.commit_id
+        };
+    }
+    async assertProjectionClean(workspace) {
+        const projection_root_hash = await this.projectionRoot(workspace);
+        if (projection_root_hash !== this.commits.root(workspace.head_sdlc_commit_id)) {
+            throw new Error('Workspace projection has uncommitted changes; commit them before this operation.');
+        }
+    }
+    async projectionRoot(workspace) {
+        try {
+            const { graph } = await composeGraphProjection(workspaceProjectionDirectory(workspace), undefined, { base: () => this.commits.readGraph(workspace.head_sdlc_commit_id) });
+            return localGraphRootHash(graph);
+        }
+        catch {
+            return null;
+        }
+    }
+}
+//# sourceMappingURL=workspace-upstream-runtime.js.map

package/dist/local/workspace-upstream-runtime.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-upstream-runtime.js","sourceRoot":"","sources":["../../src/local/workspace-upstream-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,sBAAsB,EAEtB,uBAAuB,EACxB,MAAM,iBAAiB,CAAC;AAGzB,OAAO,EAAE,kBAAkB,EAAE,MAAM,4BAA4B,CAAC;AAOhE,OAAO,EAAE,0BAA0B,EAAE,MAAM,qBAAqB,CAAC;AACjE,OAAO,EACL,wBAAwB,EAEzB,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,yBAAyB,EACzB,4BAA4B,EAC7B,MAAM,sBAAsB,CAAC;AAC9B,OAAO,EACL,0BAA0B,EAI3B,MAAM,2BAA2B,CAAC;AAEnC,OAAO,EACL,gCAAgC,EAEjC,MAAM,oCAAoC,CAAC;AA2E5C,MAAM,OAAO,6BAA6B;IAIrB;IACA;IACA;IACA;IANF,UAAU,CAAmC;IAE9D,YACmB,KAA0B,EAC1B,SAAuC,EACvC,OAAqC,EACrC,sBAAyD;QAHzD,UAAK,GAAL,KAAK,CAAqB;QAC1B,cAAS,GAAT,SAAS,CAA8B;QACvC,YAAO,GAAP,OAAO,CAA8B;QACrC,2BAAsB,GAAtB,sBAAsB,CAAmC;QAE1E,IAAI,CAAC,UAAU,GAAG,IAAI,gCAAgC,CACpD,KAAK,EACL,SAAS,EACT,OAAO,CACR,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,SAAkB;QAC7B,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,YAAY,CAAC,SAAS,CAAC,CAAC;IAC7D,CAAC;IAED,sBAAsB,CACpB,UAAkB;QAElB,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,sBAAsB,CAAC,UAAU,CAAC,CAAC;IACxE,CAAC;IAED,kBAAkB,CAChB,SAAkB;QAElB,OAAO,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,kBAAkB,CAAC,SAAS,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,OAAO,CAAC,KAEb;QACC,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IACxC,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,KAIZ;QACC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CACvD,KAAK,CAAC,kBAAkB,EACxB,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CAAC;QACF,OAAO,0BAA0B,CAAC;YAChC,WAAW,EAAE,yBAAyB,CAAC,SAAS,CAAC;YACjD,SAAS,EAAE,iBAAiB;YAC5B,GAAG,EAAE,KAAK,IAAI,EAAE;gBACd,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CAChE,SAAS,CAAC,EAAE,EACZ,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CAAC;gBACF,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;gBAC1C,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CACxD,KAAK,CAAC,6BAA6B,CACpC,CAAC;gBACF,IAAI,CAAC,WAAW,EAAE,CAAC;oBACjB,MAAM,IAAI,KAAK,CAAC,2CAA2C,CAAC,CAAC;gBAC/D,CAAC;gBACD,MAAM,YAAY,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAC/C,WAAW,CAAC,wBAAwB,CACrC,CAAC;gBACF,MAAM,UAAU,GAAG,uBAAuB,CAAC,YAAY,CAAC,CAAC;gBACzD,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,CAAC,MAAM,CACrC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,KAAK,QAAQ,CACrC,CAAC;gBACF,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACtB,MAAM,IAAI,KAAK,CACb,mCAAmC,MAAM;yBACtC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,GAAG,KAAK,CAAC,IAAI,KAAK,KAAK,CAAC,OAAO,EAAE,CAAC;yBACjD,IAAI,CAAC,IAAI,CAAC,EAAE,CAChB,CAAC;gBACJ,CAAC;gBACD,MAAM,6BAA6B,GACjC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;gBACrC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC;oBAChD,kBAAkB,EAAE,OAAO,CAAC,EAAE;oBAC9B,6BAA6B,EAAE,WAAW,CAAC,EAAE;oBAC7C,gBAAgB,EAAE,IAAI,CAAC,OAAO,CAAC,IAAI,CACjC,WAAW,CAAC,wBAAwB,CACrC;oBACD,OAAO,EAAE,KAAK,CAAC,OAAO;oBACtB,mBAAmB,EAAE,CAAC,kCAAkC,CAAC;iBAC1D,CAAC,CAAC;gBACH,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;oBACnC,OAAO;wBACL,OAAO,EAAE,CAAC;wBACV,MAAM,EAAE,YAAY;wBACpB,mBAAmB,EAAE,WAAW;wBAChC,cAAc,EAAE,MAAM,CAAC,OAAO;wBAC9B,sBAAsB,EAAE,MAAM,CAAC,sBAAsB;qBACtD,CAAC;gBACJ,CAAC;gBACD,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,sBAAsB,CAAC;wBAChC,cAAc,EAAE,4BAA4B,CAAC,OAAO,CAAC;wBACrD,KAAK,EAAE,YAAY;qBACpB,CAAC,CAAC;gBACL,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO;wBACL,OAAO,EAAE,CAAC;wBACV,MAAM,EAAE,4BAA4B;wBACpC,mBAAmB,EAAE,WAAW;wBAChC,cAAc,EAAE,MAAM,CAAC,OAAO;wBAC9B,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,cAAc,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS;wBACvC,6BAA6B;wBAC7B,gBAAgB,EACd,KAAK,YAAY,KAAK;4BACpB,CAAC,CAAC,KAAK,CAAC,OAAO;4BACf,CAAC,CAAC,oCAAoC;qBAC3C,CAAC;gBACJ,CAAC;gBACD,OAAO;oBACL,OAAO,EAAE,CAAC;oBACV,MAAM,EAAE,UAAU;oBAClB,mBAAmB,EAAE,WAAW;oBAChC,cAAc,EAAE,MAAM,CAAC,OAAO;oBAC9B,MAAM,EAAE,MAAM,CAAC,MAAM;iBACtB,CAAC;YACJ,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAED,KAAK,CAAC,SAAS,CAAC,KAKf;QACC,MAAM,EAAE,SAAS,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CACvD,KAAK,CAAC,kBAAkB,EACxB,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CAAC;QACF,OAAO,0BAA0B,CAAC;YAChC,WAAW,EAAE,yBAAyB,CAAC,SAAS,CAAC;YACjD,SAAS,EAAE,gBAAgB;YAC3B,GAAG,EAAE,KAAK,IAAI,EAAE;gBACd,MAAM,EAAE,SAAS,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,SAAS,CAAC,cAAc,CAChE,SAAS,CAAC,EAAE,EACZ,EAAE,aAAa,EAAE,IAAI,EAAE,CACxB,CAAC;gBACF,MAAM,IAAI,CAAC,qBAAqB,CAAC,OAAO,CAAC,CAAC;gBAC1C,MAAM,OAAO,GAAG,IAAI,CAAC,sBAAsB,CAAC,OAAO,CAAC,CAAC;gBACrD,MAAM,QAAQ,GAAG,IAAI,CAAC,OAAO,CAAC,OAAO,CACnC,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,kBAAkB,CAC3B,CAAC;gBACF,IAAI,QAAQ,CAAC,QAAQ,KAAK,WAAW,EAAE,CAAC;oBACtC,MAAM,IAAI,KAAK,CACb,uEAAuE,CACxE,CAAC;gBACJ,CAAC;gBACD,MAAM,IAAI,GACR,QAAQ,CAAC,QAAQ,KAAK,SAAS,IAAI,QAAQ,CAAC,QAAQ,KAAK,OAAO;oBAC9D,CAAC,CAAC,oBAAoB;oBACtB,CAAC,CAAC,QAAQ,CAAC,QAAQ,KAAK,QAAQ;wBAC9B,CAAC,CAAC,cAAc;wBAChB,CAAC,CAAC,OAAO,CAAC;gBAChB,MAAM,oBAAoB,GACxB,IAAI,KAAK,cAAc;oBACrB,CAAC,CAAC,OAAO,CAAC,eAAe;oBACzB,CAAC,CAAC,IAAI,KAAK,oBAAoB;wBAC7B,CAAC,CAAC,OAAO,CAAC,kBAAkB;wBAC5B,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,aAAa,CACxB,OAAO,CAAC,eAAe,EACvB,OAAO,CAAC,kBAAkB,CAC3B,CAAC;gBACV,MAAM,UAAU,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,oBAAoB,CAAC,CAAC;gBACtE,MAAM,WAAW,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CAC9C,OAAO,CAAC,eAAe,CACxB,CAAC;gBACF,MAAM,cAAc,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,SAAS,CACjD,OAAO,CAAC,kBAAkB,CAC3B,CAAC;gBACF,IAAI,YAAY,GAAG,wBAAwB,CAAC;oBAC1C,UAAU;oBACV,iBAAiB,EAAE,WAAW;oBAC9B,WAAW,EAAE,cAAc;iBAC5B,CAAC,CAAC;gBACH,IAAI,mBAAmB,GAAqC,EAAE,CAAC;gBAC/D,IACE,YAAY,CAAC,MAAM,KAAK,kBAAkB;oBAC1C,KAAK,CAAC,iBAAiB,EACvB,CAAC;oBACD,MAAM,UAAU,GAAG,MAAM,0BAA0B,CAAC;wBAClD,UAAU;wBACV,iBAAiB,EAAE,WAAW;wBAC9B,WAAW,EAAE,cAAc;wBAC3B,YAAY;wBACZ,UAAU,EAAE,IAAI;wBAChB,QAAQ,EAAE,KAAK,CAAC,iBAAiB;wBACjC,MAAM,EAAE,KAAK,CAAC,iBAAiB;wBAC/B,sBAAsB,EAAE,KAAK,CAAC,sBAAsB;wBACpD,uBAAuB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,KAAK,CAAC;qBACnE,CAAC,CAAC;oBACH,mBAAmB,GAAG,UAAU,CAAC,QAAQ,CAAC;oBAC1C,IAAI,UAAU,CAAC,MAAM,KAAK,kBAAkB,EAAE,CAAC;wBAC7C,YAAY,GAAG,UAAU,CAAC,YAAY,CAAC;oBACzC,CAAC;gBACH,CAAC;gBACD,IAAI,YAAY,CAAC,MAAM,KAAK,kBAAkB,EAAE,CAAC;oBAC/C,MAAM,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC;gBACpD,CAAC;gBACD,MAAM,6BAA6B,GACjC,MAAM,IAAI,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC;gBACrC,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC;oBACnD,kBAAkB,EAAE,OAAO,CAAC,EAAE;oBAC9B,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,WAAW,EAAE,OAAO,CAAC,WAAW;oBAChC,UAAU,EAAE,OAAO,CAAC,UAAU;oBAC9B,YAAY,EAAE,OAAO,CAAC,YAAY;oBAClC,wBAAwB,EAAE,OAAO,CAAC,eAAe;oBACjD,2BAA2B,EAAE,OAAO,CAAC,kBAAkB;oBACvD,oBAAoB;oBACpB,IAAI;oBACJ,YAAY;oBACZ,mBAAmB;oBACnB,mBAAmB,EACjB,mBAAmB,CAAC,MAAM,GAAG,CAAC;wBAC5B,CAAC,CAAC;4BACE,kCAAkC;4BAClC,6CAA6C;yBAC9C;wBACH,CAAC,CAAC,CAAC,kCAAkC,CAAC;iBAC3C,CAAC,CAAC;gBACH,MAAM,MAAM,GAAG;oBACb,OAAO,EAAE,CAAU;oBACnB,SAAS,EAAE,OAAO,CAAC,SAAS;oBAC5B,YAAY,EAAE,OAAO,CAAC,YAAY;oBAClC,wBAAwB,EAAE,OAAO,CAAC,eAAe;oBACjD,kBAAkB,EAAE,OAAO,CAAC,kBAAkB;oBAC9C,OAAO,EAAE,MAAM,CAAC,OAAO;iBACxB,CAAC;gBACF,IACE,MAAM,CAAC,MAAM,KAAK,kBAAkB;oBACpC,MAAM,CAAC,MAAM,KAAK,oBAAoB,EACtC,CAAC;oBACD,OAAO;wBACL,GAAG,MAAM;wBACT,MAAM,EAAE,MAAM,CAAC,MAAM;wBACrB,YAAY;wBACZ,mBAAmB,EAAE,MAAM,CAAC,mBAAmB;qBAChD,CAAC;gBACJ,CAAC;gBACD,IAAI,MAAM,CAAC,MAAM,KAAK,YAAY,EAAE,CAAC;oBACnC,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBAClC,CAAC;gBACD,IAAI,MAAM,CAAC,MAAM,KAAK,oBAAoB,EAAE,CAAC;oBAC3C,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;gBAClC,CAAC;gBACD,MAAM,cAAc,GAClB,MAAM,CAAC,MAAM,KAAK,QAAQ,CAAC,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC;gBACxE,IAAI,YAAY,CAAC,MAAM,KAAK,OAAO,EAAE,CAAC;oBACpC,MAAM,IAAI,KAAK,CACb,0DAA0D,CAC3D,CAAC;gBACJ,CAAC;gBACD,IAAI,CAAC;oBACH,MAAM,IAAI,CAAC,sBAAsB,CAAC;wBAChC,cAAc,EAAE,4BAA4B,CAAC,OAAO,CAAC;wBACrD,KAAK,EAAE,YAAY,CAAC,KAAK;qBAC1B,CAAC,CAAC;gBACL,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,OAAO;wBACL,GAAG,MAAM;wBACT,MAAM,EAAE,8BAA8B;wBACtC,kBAAkB,EAAE,MAAM,CAAC,MAAM;wBACjC,cAAc;wBACd,cAAc,EAAE,YAAY,CAAC,SAAS;wBACtC,6BAA6B;wBAC7B,gBAAgB,EACd,KAAK,YAAY,KAAK;4BACpB,CAAC,CAAC,KAAK,CAAC,OAAO;4BACf,CAAC,CAAC,oCAAoC;qBAC3C,CAAC;gBACJ,CAAC;gBACD,OAAO,EAAE,GAAG,MAAM,EAAE,GAAG,MAAM,EAAE,CAAC;YAClC,CAAC;SACF,CAAC,CAAC;IACL,CAAC;IAEO,sBAAsB,CAAC,SAAyB;QACtD,IAAI,CAAC,SAAS,CAAC,YAAY,EAAE,CAAC;YAC5B,MAAM,IAAI,KAAK,CACb,0DAA0D,CAC3D,CAAC;QACJ,CAAC;QACD,MAAM,WAAW,GAAG,IAAI,CAAC,KAAK,CAAC,oBAAoB,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QAC5E,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,SAAS,CAAC,YAAY,CAAC,CAAC;QACxD,IAAI,CAAC,WAAW,IAAI,CAAC,KAAK,EAAE,CAAC;YAC3B,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;QACD,MAAM,EAAE,oBAAoB,EAAE,mBAAmB,EAAE,qBAAqB,EAAE,GACxE,WAAW,CAAC;QACd,IACE,CAAC,oBAAoB;YACrB,CAAC,mBAAmB;YACpB,CAAC,qBAAqB,EACtB,CAAC;YACD,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAC;QAC1E,CAAC;QACD,MAAM,QAAQ,GAAG,IAAI,CAAC,KAAK,CAAC,eAAe,CAAC,MAAM,CAChD,oBAAoB,EACpB,mBAAmB,CACpB,CAAC;QACF,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,YAAY,KAAK,qBAAqB,EAAE,CAAC;YACjE,MAAM,IAAI,KAAK,CACb,gEAAgE,CACjE,CAAC;QACJ,CAAC;QACD,IAAI,SAAS,CAAC,mBAAmB,KAAK,KAAK,CAAC,cAAc,EAAE,CAAC;YAC3D,MAAM,IAAI,KAAK,CAAC,oDAAoD,CAAC,CAAC;QACxE,CAAC;QACD,OAAO;YACL,SAAS,EAAE,KAAK,CAAC,QAAQ;YACzB,eAAe,EAAE,KAAK,CAAC,cAAc;YACrC,WAAW,EAAE,oBAAoB;YACjC,UAAU,EAAE,mBAAmB;YAC/B,YAAY,EAAE,qBAAqB;YACnC,kBAAkB,EAAE,QAAQ,CAAC,SAAS;SACvC,CAAC;IACJ,CAAC;IAEO,KAAK,CAAC,qBAAqB,CACjC,SAAyB;QAEzB,MAAM,oBAAoB,GAAG,MAAM,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC;QAClE,IACE,oBAAoB,KAAK,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,SAAS,CAAC,mBAAmB,CAAC,EACzE,CAAC;YACD,MAAM,IAAI,KAAK,CACb,kFAAkF,CACnF,CAAC;QACJ,CAAC;IACH,CAAC;IAEO,KAAK,CAAC,cAAc,CAC1B,SAAyB;QAEzB,IAAI,CAAC;YACH,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,sBAAsB,CAC5C,4BAA4B,CAAC,SAAS,CAAC,EACvC,SAAS,EACT,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC,SAAS,CAAC,mBAAmB,CAAC,EAAE,CACtE,CAAC;YACF,OAAO,kBAAkB,CAAC,KAAK,CAAC,CAAC;QACnC,CAAC;QAAC,MAAM,CAAC;YACP,OAAO,IAAI,CAAC;QACd,CAAC;IACH,CAAC;CACF"}

package/dist/local/workspace-upstream-store.d.ts

@@ -0,0 +1,51 @@
+import type { LocalGraphMergeResult } from './workspace-merge.js';
+import { LocalWorkspaceHistoryJournal } from './workspace-history-journal.js';
+import type { LocalBranchIntegrationAttempt, LocalBranchIntegrationRevertAttempt, LocalBranchIntegrationRevertStoreResult, LocalBranchIntegrationResolutionAttempt, LocalBranchIntegrationStoreResult } from './workspace-history-types.js';
+import type { LocalResolutionAttemptEvidence } from './workspace-resolution.js';
+import type { LocalWorkspaceStoreDatabase } from './workspace-store-database.js';
+export type BranchUpstreamIntegrationInput = {
+    actor_workspace_id: string;
+    local_ref: string;
+    remote_name: string;
+    source_ref: string;
+    tracking_ref: string;
+    expected_local_commit_id: string;
+    expected_upstream_commit_id: string;
+    merge_base_commit_id: string;
+    mode: 'already_integrated' | 'fast_forward' | 'merge';
+    merge_result: LocalGraphMergeResult;
+    message?: string;
+    validation_evidence?: string[];
+    resolution_attempts?: LocalResolutionAttemptEvidence[];
+};
+export type BranchUpstreamRevertInput = {
+    actor_workspace_id: string;
+    branch_integration_attempt_id: string;
+    target_root_hash: string;
+    message?: string;
+    validation_evidence?: string[];
+};
+export declare class LocalWorkspaceUpstreamStore {
+    private readonly database;
+    private readonly journal;
+    private readonly mixed_history;
+    constructor(database: LocalWorkspaceStoreDatabase, journal: LocalWorkspaceHistoryJournal);
+    listAttempts(local_ref?: string): LocalBranchIntegrationAttempt[];
+    listResolutionAttempts(branch_integration_attempt_id: string): LocalBranchIntegrationResolutionAttempt[];
+    getAttempt(attempt_id: string): LocalBranchIntegrationAttempt | null;
+    listRevertAttempts(local_ref?: string): LocalBranchIntegrationRevertAttempt[];
+    revert(input: BranchUpstreamRevertInput): LocalBranchIntegrationRevertStoreResult;
+    integrate(input: BranchUpstreamIntegrationInput): LocalBranchIntegrationStoreResult;
+    private runTransaction;
+    private requireActiveWorkspace;
+    private assertAssociation;
+    private createCandidate;
+    private createCommit;
+    private advanceWorkspaceHead;
+    private recordAttempt;
+    private recordRevertAttempt;
+    private assertMergeBindings;
+    private canonicalCommitId;
+    private localCommit;
+}
+//# sourceMappingURL=workspace-upstream-store.d.ts.map

package/dist/local/workspace-upstream-store.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"workspace-upstream-store.d.ts","sourceRoot":"","sources":["../../src/local/workspace-upstream-store.ts"],"names":[],"mappings":"AAKA,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AAElE,OAAO,EAAE,4BAA4B,EAAE,MAAM,gCAAgC,CAAC;AAC9E,OAAO,KAAK,EACV,6BAA6B,EAC7B,mCAAmC,EACnC,uCAAuC,EACvC,uCAAuC,EACvC,iCAAiC,EAElC,MAAM,8BAA8B,CAAC;AACtC,OAAO,KAAK,EAAE,8BAA8B,EAAE,MAAM,2BAA2B,CAAC;AAChF,OAAO,KAAK,EAAE,2BAA2B,EAAE,MAAM,+BAA+B,CAAC;AAEjF,MAAM,MAAM,8BAA8B,GAAG;IAC3C,kBAAkB,EAAE,MAAM,CAAC;IAC3B,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,YAAY,EAAE,MAAM,CAAC;IACrB,wBAAwB,EAAE,MAAM,CAAC;IACjC,2BAA2B,EAAE,MAAM,CAAC;IACpC,oBAAoB,EAAE,MAAM,CAAC;IAC7B,IAAI,EAAE,oBAAoB,GAAG,cAAc,GAAG,OAAO,CAAC;IACtD,YAAY,EAAE,qBAAqB,CAAC;IACpC,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC/B,mBAAmB,CAAC,EAAE,8BAA8B,EAAE,CAAC;CACxD,CAAC;AAEF,MAAM,MAAM,yBAAyB,GAAG;IACtC,kBAAkB,EAAE,MAAM,CAAC;IAC3B,6BAA6B,EAAE,MAAM,CAAC;IACtC,gBAAgB,EAAE,MAAM,CAAC;IACzB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,mBAAmB,CAAC,EAAE,MAAM,EAAE,CAAC;CAChC,CAAC;AA6BF,qBAAa,2BAA2B;IAIpC,OAAO,CAAC,QAAQ,CAAC,QAAQ;IACzB,OAAO,CAAC,QAAQ,CAAC,OAAO;IAJ1B,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAyB;gBAGpC,QAAQ,EAAE,2BAA2B,EACrC,OAAO,EAAE,4BAA4B;IAyBxD,YAAY,CAAC,SAAS,CAAC,EAAE,MAAM,GAAG,6BAA6B,EAAE;IAoBjE,sBAAsB,CACpB,6BAA6B,EAAE,MAAM,GACpC,uCAAuC,EAAE;IAc5C,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,6BAA6B,GAAG,IAAI;IAUpE,kBAAkB,CAChB,SAAS,CAAC,EAAE,MAAM,GACjB,mCAAmC,EAAE;IAqBxC,MAAM,CACJ,KAAK,EAAE,yBAAyB,GAC/B,uCAAuC;IAiG1C,SAAS,CACP,KAAK,EAAE,8BAA8B,GACpC,iCAAiC;IAkIpC,OAAO,CAAC,cAAc;IAYtB,OAAO,CAAC,sBAAsB;IAa9B,OAAO,CAAC,iBAAiB;IAuBzB,OAAO,CAAC,eAAe;IA+BvB,OAAO,CAAC,YAAY;IA+CpB,OAAO,CAAC,oBAAoB;IAqC5B,OAAO,CAAC,aAAa;IAkCrB,OAAO,CAAC,mBAAmB;IA8C3B,OAAO,CAAC,mBAAmB;IAuD3B,OAAO,CAAC,iBAAiB;IAazB,OAAO,CAAC,WAAW;CAwBpB"}