@aui.io/apollo 0.1.84 → 0.1.87

package/node_modules/@aui.io/apollo-cli/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@aui.io/apollo-cli",
-  "version": "0.1.84",
+  "version": "0.1.87",
   "description": "Command-line client for the Apollo runtime",
   "type": "module",
   "engines": {
@@ -33,12 +33,12 @@
     "test": "vitest run"
   },
   "dependencies": {
-    "@aui.io/apollo-core": "0.1.84",
+    "@aui.io/apollo-core": "0.1.87",
     "commander": "^14.0.3",
     "picocolors": "^1.1.1"
   },
   "optionalDependencies": {
-    "@aui.io/apollo-tui": "0.1.84"
+    "@aui.io/apollo-tui": "0.1.87"
   },
   "devDependencies": {
     "@eslint/js": "^9.39.5",

package/node_modules/@aui.io/apollo-core/dist/src/api/agent-settings.d.ts

@@ -50,6 +50,8 @@ export interface BuildBundlePushResponse {
      * what they uploaded instead. */
     files_count?: number;
     created_at: string;
+    /** The program commit this bundle was pinned to, when one was named. */
+    program_version_tag?: string | null;
 }
 /** The bundle document returned by `build-bundles/pull`. */
 export interface BuildBundle {
@@ -60,6 +62,11 @@ export interface BuildBundle {
     notes?: string | null;
     created_at: string;
     created_by: string;
+    /** The program COMMIT this material belongs with (`v3.12`), recorded at push
+     *  time. Absent on a bundle pushed before the pin existed, or by a caller
+     *  that named none — a pull asking for a commit reads this to see whether it
+     *  got the material it asked for or a fallback. */
+    program_version_tag?: string | null;
 }
 /** 200 response body from `build-bundles/pull`. */
 export interface BuildBundlePullResponse {
@@ -164,6 +171,10 @@ export declare class AgentSettingsClient {
     pushBuildBundle(agentId: string, input: {
         files: BundleUploadFile[];
         createdBy: string;
+        /** The program commit this material belongs with (`v3.12`) — the tag the
+         *  program push just returned. Omitted, the bundle is unpinned and a
+         *  pull can only ask for the agent's latest. */
+        programVersionTag?: string;
         notes?: string;
     }): Promise<BuildBundlePushResponse>;
     /**
@@ -173,6 +184,12 @@ export declare class AgentSettingsClient {
      */
     pullBuildBundle(agentId: string, options?: {
         version?: number;
+        /** Ask for the material that belongs with this program commit (`v3.12`)
+         *  instead of the agent's latest push. No bundle carries that exact
+         *  save → the newest one pinned to an earlier save of the same line;
+         *  none there either → the latest. Ignored when `version` is given.
+         *  The answer's own `program_version_tag` says which came back. */
+        programVersionTag?: string;
         expiresIn?: number;
     }): Promise<BuildBundlePullResponse>;
 }

package/node_modules/@aui.io/apollo-core/dist/src/api/agent-settings.js

@@ -62,6 +62,9 @@ export class AgentSettingsClient {
                 fields: {
                     created_by: input.createdBy,
                     paths: JSON.stringify(input.files.map((file) => file.path)),
+                    ...(input.programVersionTag === undefined
+                        ? {}
+                        : { program_version_tag: input.programVersionTag }),
                     ...(input.notes === undefined ? {} : { notes: input.notes }),
                 },
             },
@@ -76,6 +79,7 @@ export class AgentSettingsClient {
         return this.http.request(`/v1/agents/${encodeURIComponent(agentId)}/build-bundles/pull`, {
             query: {
                 version: options.version,
+                program_version_tag: options.programVersionTag,
                 expires_in: options.expiresIn,
             },
         });

package/node_modules/@aui.io/apollo-core/dist/src/api/agent-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"agent-settings.js","sourceRoot":"","sources":["../../../src/api/agent-settings.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"agent-settings.js","sourceRoot":"","sources":["../../../src/api/agent-settings.ts"],"names":[],"mappings":"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"}

package/node_modules/@aui.io/apollo-core/dist/src/api/builder-api.d.ts

@@ -417,6 +417,10 @@ export declare class BuilderApiClient {
     validateTree(files: BuilderTree, agentId?: string, options?: {
         fix?: boolean;
     }): Promise<BuilderValidation>;
+    /** Bring `theirs` into `ours` over `base` — the mechanical half of
+     *  `apollo merge-from`, computed by the builder's own merge so the CLI and
+     *  the builder's `merge_from` tool agree on every hunk. Nothing is stored. */
+    merge(request: MergeTreesRequest): Promise<MergeTreesResult>;
     /** Enqueue one advisor turn (202 immediately — the answer comes by poll). */
     advise(ask: AdvisorAsk): Promise<AdvisorStarted>;
     adviceView(turnId: string): Promise<AdvisorView>;
@@ -454,3 +458,35 @@ export declare class BuilderApiClient {
      *  names the rows that moved. Same 404 as `certificate`. */
     certificateForTree(agentId: string, version: string, files: BuilderTree): Promise<CertificateView>;
 }
+/** `{path: text}` program trees; a `src/` prefix is accepted. */
+export interface MergeTreesRequest {
+    ours: Record<string, string>;
+    theirs: Record<string, string>;
+    /** The save both lines were branched from; omitted = two-way. */
+    base?: Record<string, string>;
+    /** Narrow the merge to these files (a cherry-pick). */
+    paths?: string[];
+}
+export interface MergeRegion {
+    base: string;
+    ours: string;
+    theirs: string;
+}
+export interface MergeConflict {
+    path: string;
+    reason: string;
+    ours: string | null;
+    theirs: string | null;
+    /** The three-way hunks both sides changed differently; empty for a
+     *  whole-file conflict (a deletion against a change, or a two-way merge). */
+    regions: MergeRegion[];
+}
+export interface MergeTreesResult {
+    /** The merged tree — every conflicting region kept at OURS. */
+    files: Record<string, string>;
+    /** Per touched path: `ours` | `theirs` | `both` | `conflict`. */
+    taken: Record<string, string>;
+    conflicts: MergeConflict[];
+    clean: boolean;
+    summary: string;
+}

package/node_modules/@aui.io/apollo-core/dist/src/api/builder-api.js

@@ -21,6 +21,12 @@ export class BuilderApiClient {
             },
         });
     }
+    /** Bring `theirs` into `ours` over `base` — the mechanical half of
+     *  `apollo merge-from`, computed by the builder's own merge so the CLI and
+     *  the builder's `merge_from` tool agree on every hunk. Nothing is stored. */
+    merge(request) {
+        return this.http.request("/v1/builder/merge", { method: "POST", body: request });
+    }
     /** Enqueue one advisor turn (202 immediately — the answer comes by poll). */
     advise(ask) {
         return this.http.request("/v1/builder/advisor", {

package/node_modules/@aui.io/apollo-core/dist/src/api/builder-api.js.map

@@ -1 +1 @@
-{"version":3,"file":"builder-api.js","sourceRoot":"","sources":["../../../src/api/builder-api.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"builder-api.js","sourceRoot":"","sources":["../../../src/api/builder-api.ts"],"names":[],"mappings":"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"}

package/node_modules/@aui.io/apollo-core/dist/src/api/management.d.ts

@@ -22,6 +22,9 @@ export interface AgentVersion {
     version_tag: string;
     status: VersionStatus;
     parent_version_id?: string | null;
+    /** The exact COMMIT this branch was cut from (`v3.12`); absent for a
+     *  first version or one created before lineage was recorded. */
+    parent_version_tag?: string | null;
     label?: string | null;
     tags: string[];
     notes?: string | null;
@@ -47,7 +50,26 @@ export interface VersionPush {
     created_at: string;
     commit_message?: string | null;
 }
+/** One COMMIT on a branch, as the internal surface lists it. */
+export interface AgentRevision {
+    id: string;
+    /** The commit's own tag, e.g. `v3.7`. */
+    version_tag: string;
+    caller: string;
+    commit_message?: string | null;
+    created_at: string;
+    created_by: string;
+    created_by_email?: string | null;
+}
 export type VersionSource = "version" | "agent-scope" | "template" | "empty";
+/** Which COMMIT an agent serves, as apollo reads it back off the agent. */
+export interface AgentLiveSave {
+    agent_id: string;
+    active_version_id?: string | null;
+    /** The exact commit that is live (`v3.7`). */
+    active_version_tag?: string | null;
+}
+export declare function isLiveRef(ref: string): boolean;
 /**
  * The version row `live_version_id` points at. The field's name says id,
  * but the wire returns the version *tag* on some environments (staging
@@ -55,8 +77,22 @@ export type VersionSource = "version" | "agent-scope" | "template" | "empty";
  * wild, so a live lookup must match either. Matching only one side made
  * `agent import` report "no live version" for agents that had one
  * (REPORTS-26), while sends assumed the tag shape and worked by luck.
+ *
+ * The tag names the live COMMIT, which its branch may have moved past
+ * (`v3.7` while the row reads `v3.9`), so a tag matches its branch by number.
  */
 export declare function findLiveVersion(agent: Pick<Agent, "live_version_id">, versions: AgentVersion[]): AgentVersion | undefined;
+/** The commit `live` (from `findLiveVersion`) serves: the tag the agent names,
+ *  or the branch's newest when the agent names the version by id. */
+export declare function liveCommitTag(agent: Pick<Agent, "live_version_id">, live: AgentVersion): string;
+/** A branch's name, `v3` — how `branch list` prints it and every verb takes it. */
+export declare function branchName(version: Pick<AgentVersion, "version_tag"> & {
+    version_number?: number;
+}): string;
+/** The default name of a branch cut from `version`: its name, marked continued once. */
+export declare function continuedName(version: Pick<AgentVersion, "label" | "version_tag">): string;
+/** A branch's state as people say it: the registry's `published` is `locked`. */
+export declare function branchState(status: VersionStatus): string;
 export declare class ManagementClient {
     private readonly http;
     constructor(http: HttpClient);
@@ -71,9 +107,8 @@ export declare class ManagementClient {
      *
      * `runtimeVersion` picks the engine and with it the create flow: a `1.x`
      * family runs the legacy v1 flow; anything else creates a runtime-v2 agent
-     * seeded with one empty editable draft (no live version until the first
-     * real push + publish). `fromTemplate` names an explicit clone source; the
-     * agent then goes live on the template's content immediately.
+     * seeded with one open branch whose first commit is live. `fromTemplate`
+     * names an explicit clone source for that commit.
      */
     createAgent(projectId: string, input: {
         name: string;
@@ -81,12 +116,27 @@ export declare class ManagementClient {
         runtimeVersion?: string;
     }): Promise<Agent>;
     getAgent(agentId: string): Promise<Agent>;
+    /**
+     * The agent's versions. INTERNAL, for `parent_version_tag`: the published
+     * record has no lineage field, and the merge-base walk
+     * (`bundle/lineage.ts`) and `apollo branch list`'s "from v3.12" line both
+     * read it.
+     *
+     * The internal surface answers `{items}` where the published one answers
+     * `{results}`; the envelope is normalized here so no caller has to know
+     * which surface served it.
+     */
     listVersions(agentId: string, filters?: {
         status?: VersionStatus;
         tag?: string;
         versionNumber?: number;
         excludeRevisions?: boolean;
     }): Promise<Page<AgentVersion>>;
+    /** A branch's commits, newest first — one page of `size`, with the branch's total. */
+    listRevisions(agentId: string, versionId: string, size: number): Promise<{
+        results: AgentRevision[];
+        total: number;
+    }>;
     /**
      * Resolve a local pin (`v{major}.{revision}`) to a version row.
      *
@@ -96,14 +146,62 @@ export declare class ManagementClient {
      * `v0.11` on the same draft.
      */
     resolveVersion(agentId: string, tag: string): Promise<AgentVersion>;
+    /**
+     * A ref → the branch row AND the exact COMMIT it names. `resolveVersion`
+     * answers with the row (whose tag is the branch's newest commit); a ref like
+     * `v3.7` that names an older commit keeps it here, so fetch, diff,
+     * merge-from and `version create --from` work from the commit the author
+     * pointed at, not the tip. `live` is the live commit, and a commit the
+     * branch does not have is refused rather than read as its newest.
+     */
+    resolveRef(agentId: string, ref: string): Promise<{
+        version: AgentVersion;
+        tag: string;
+    }>;
     createVersion(agentId: string, input: {
         source: VersionSource;
+        /** The signed-in user the new version is attributed to. */
+        createdBy: string;
         fromVersion?: string;
+        /** Cut from this exact commit of `fromVersion` (`v3.7`) rather than
+         *  its latest one; recorded as the draft's `parent_version_tag`. */
+        fromVersionTag?: string;
         fromTemplate?: string;
         label?: string;
         tags?: string[];
         notes?: string;
     }): Promise<AgentVersion>;
+    /** Rename a version (its `label`) — the name people refer to it by. */
+    updateVersion(agentId: string, versionId: string, patch: {
+        label?: string;
+        notes?: string;
+    }): Promise<AgentVersion>;
+    /**
+     * LOCK a branch (draft → locked): no more commits land on it. Working-tree
+     * management, and no statement about customers — live is a pinned SAVE held
+     * by the agent, not by a version's status.
+     *
+     * INTERNAL, and not by choice: the published surface has no lock route at
+     * all (its `publish` verb locks AND ships, which is the pair this split
+     * exists to separate).
+     */
+    lockVersion(agentId: string, versionId: string, lockedBy: string): Promise<AgentVersion>;
+    /** UNLOCK a locked branch (locked → draft), so commits land on it again —
+     *  the undo for locking one too early. It cannot change what customers get.
+     *  INTERNAL: the published surface has no such verb. */
+    unlockVersion(agentId: string, versionId: string): Promise<AgentVersion>;
+    /**
+     * Make ONE COMMIT live — the exact bundle the agent serves.
+     *
+     * `versionTag` names it; omitted, the branch's newest commit goes live. Any
+     * non-archived branch qualifies, a draft included, and a later push onto
+     * it does NOT move the pointer. The answer is apollo's read-back of the
+     * agent, so a caller sees the commit that is actually live.
+     *
+     * INTERNAL: the published `publish` verb means "lock it, then ship its
+     * newest commit" and keeps that meaning.
+     */
+    activateSave(agentId: string, versionId: string, versionTag?: string): Promise<AgentLiveSave>;
     publishVersion(agentId: string, versionId: string): Promise<AgentVersion>;
     archiveVersion(agentId: string, versionId: string): Promise<AgentVersion>;
     /**
@@ -112,7 +210,13 @@ export declare class ManagementClient {
      * the agent's `active_blob_stats`). Omitted, the revision is unpinned —
      * exactly the payload every push sent before the field existed.
      */
-    pushVersion(agentId: string, versionId: string, bundle: Record<string, unknown>, commitMessage?: string, runtimeVersion?: string): Promise<VersionPush>;
+    pushVersion(agentId: string, versionId: string, bundle: Record<string, unknown>, 
+    /** The signed-in user the commit is attributed to. */
+    pushedBy: string, commitMessage?: string, runtimeVersion?: string, 
+    /** The commit these changes are based on. The registry refuses the push
+     *  (409 `agent_versions.version_moved`) when the version has moved past
+     *  it — nobody's commit is ever silently overwritten. */
+    baseVersionTag?: string): Promise<VersionPush>;
     pullVersion(agentId: string, versionId: string, versionTag?: string): Promise<VersionPull>;
 }
 /** `v8.14` / `v8` → major (+ optional revision). */