@aui.io/apollo 0.1.84 → 0.1.87

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (84) hide show
  1. package/README.md +4 -4
  2. package/node_modules/@aui.io/apollo-cli/dist/src/commands/bundles.js +239 -33
  3. package/node_modules/@aui.io/apollo-cli/dist/src/commands/bundles.js.map +1 -1
  4. package/node_modules/@aui.io/apollo-cli/dist/src/commands/hierarchy.js +2 -2
  5. package/node_modules/@aui.io/apollo-cli/dist/src/commands/hierarchy.js.map +1 -1
  6. package/node_modules/@aui.io/apollo-cli/dist/src/commands/mockdb.js +9 -8
  7. package/node_modules/@aui.io/apollo-cli/dist/src/commands/mockdb.js.map +1 -1
  8. package/node_modules/@aui.io/apollo-cli/dist/src/commands/operate.js +31 -12
  9. package/node_modules/@aui.io/apollo-cli/dist/src/commands/operate.js.map +1 -1
  10. package/node_modules/@aui.io/apollo-cli/package.json +3 -3
  11. package/node_modules/@aui.io/apollo-core/dist/src/api/agent-settings.d.ts +17 -0
  12. package/node_modules/@aui.io/apollo-core/dist/src/api/agent-settings.js +4 -0
  13. package/node_modules/@aui.io/apollo-core/dist/src/api/agent-settings.js.map +1 -1
  14. package/node_modules/@aui.io/apollo-core/dist/src/api/builder-api.d.ts +36 -0
  15. package/node_modules/@aui.io/apollo-core/dist/src/api/builder-api.js +6 -0
  16. package/node_modules/@aui.io/apollo-core/dist/src/api/builder-api.js.map +1 -1
  17. package/node_modules/@aui.io/apollo-core/dist/src/api/management.d.ts +108 -4
  18. package/node_modules/@aui.io/apollo-core/dist/src/api/management.js +198 -18
  19. package/node_modules/@aui.io/apollo-core/dist/src/api/management.js.map +1 -1
  20. package/node_modules/@aui.io/apollo-core/dist/src/api/mock-db.d.ts +1 -5
  21. package/node_modules/@aui.io/apollo-core/dist/src/api/mock-db.js +4 -10
  22. package/node_modules/@aui.io/apollo-core/dist/src/api/mock-db.js.map +1 -1
  23. package/node_modules/@aui.io/apollo-core/dist/src/bundle/baseline.d.ts +12 -2
  24. package/node_modules/@aui.io/apollo-core/dist/src/bundle/baseline.js +67 -15
  25. package/node_modules/@aui.io/apollo-core/dist/src/bundle/baseline.js.map +1 -1
  26. package/node_modules/@aui.io/apollo-core/dist/src/bundle/files.d.ts +13 -0
  27. package/node_modules/@aui.io/apollo-core/dist/src/bundle/files.js +20 -0
  28. package/node_modules/@aui.io/apollo-core/dist/src/bundle/files.js.map +1 -1
  29. package/node_modules/@aui.io/apollo-core/dist/src/bundle/lineage.d.ts +29 -0
  30. package/node_modules/@aui.io/apollo-core/dist/src/bundle/lineage.js +65 -0
  31. package/node_modules/@aui.io/apollo-core/dist/src/bundle/lineage.js.map +1 -0
  32. package/node_modules/@aui.io/apollo-core/dist/src/bundle/materialize.d.ts +25 -4
  33. package/node_modules/@aui.io/apollo-core/dist/src/bundle/materialize.js +78 -8
  34. package/node_modules/@aui.io/apollo-core/dist/src/bundle/materialize.js.map +1 -1
  35. package/node_modules/@aui.io/apollo-core/dist/src/config/index.d.ts +2 -0
  36. package/node_modules/@aui.io/apollo-core/dist/src/config/index.js +7 -0
  37. package/node_modules/@aui.io/apollo-core/dist/src/config/index.js.map +1 -1
  38. package/node_modules/@aui.io/apollo-core/dist/src/config/mockdb-keys.d.ts +3 -0
  39. package/node_modules/@aui.io/apollo-core/dist/src/config/mockdb-keys.js +5 -0
  40. package/node_modules/@aui.io/apollo-core/dist/src/config/mockdb-keys.js.map +1 -1
  41. package/node_modules/@aui.io/apollo-core/dist/src/errors/index.d.ts +75 -0
  42. package/node_modules/@aui.io/apollo-core/dist/src/errors/index.js +109 -0
  43. package/node_modules/@aui.io/apollo-core/dist/src/errors/index.js.map +1 -1
  44. package/node_modules/@aui.io/apollo-core/dist/src/index.d.ts +1 -1
  45. package/node_modules/@aui.io/apollo-core/dist/src/index.js.map +1 -1
  46. package/node_modules/@aui.io/apollo-core/dist/src/output/index.d.ts +2 -0
  47. package/node_modules/@aui.io/apollo-core/dist/src/output/index.js +5 -1
  48. package/node_modules/@aui.io/apollo-core/dist/src/output/index.js.map +1 -1
  49. package/node_modules/@aui.io/apollo-core/dist/src/services/bundles.d.ts +76 -2
  50. package/node_modules/@aui.io/apollo-core/dist/src/services/bundles.js +225 -70
  51. package/node_modules/@aui.io/apollo-core/dist/src/services/bundles.js.map +1 -1
  52. package/node_modules/@aui.io/apollo-core/dist/src/services/doctor.js +4 -3
  53. package/node_modules/@aui.io/apollo-core/dist/src/services/doctor.js.map +1 -1
  54. package/node_modules/@aui.io/apollo-core/dist/src/services/hierarchy.d.ts +14 -21
  55. package/node_modules/@aui.io/apollo-core/dist/src/services/hierarchy.js +17 -27
  56. package/node_modules/@aui.io/apollo-core/dist/src/services/hierarchy.js.map +1 -1
  57. package/node_modules/@aui.io/apollo-core/dist/src/services/messaging.d.ts +15 -9
  58. package/node_modules/@aui.io/apollo-core/dist/src/services/messaging.js +41 -18
  59. package/node_modules/@aui.io/apollo-core/dist/src/services/messaging.js.map +1 -1
  60. package/node_modules/@aui.io/apollo-core/dist/src/services/mockdb.d.ts +4 -3
  61. package/node_modules/@aui.io/apollo-core/dist/src/services/mockdb.js +84 -117
  62. package/node_modules/@aui.io/apollo-core/dist/src/services/mockdb.js.map +1 -1
  63. package/node_modules/@aui.io/apollo-core/dist/src/services/versions.d.ts +88 -0
  64. package/node_modules/@aui.io/apollo-core/dist/src/services/versions.js +202 -0
  65. package/node_modules/@aui.io/apollo-core/dist/src/services/versions.js.map +1 -0
  66. package/node_modules/@aui.io/apollo-core/dist/src/skills/agents-page.js +2 -2
  67. package/node_modules/@aui.io/apollo-core/dist/src/skills/agents-page.js.map +1 -1
  68. package/node_modules/@aui.io/apollo-core/package.json +1 -1
  69. package/node_modules/@aui.io/apollo-tui/dist/src/actions/registry.js +13 -13
  70. package/node_modules/@aui.io/apollo-tui/dist/src/actions/registry.js.map +1 -1
  71. package/node_modules/@aui.io/apollo-tui/dist/src/activity/operationStore.js +2 -2
  72. package/node_modules/@aui.io/apollo-tui/dist/src/activity/operationStore.js.map +1 -1
  73. package/node_modules/@aui.io/apollo-tui/dist/src/author/data.js +3 -2
  74. package/node_modules/@aui.io/apollo-tui/dist/src/author/data.js.map +1 -1
  75. package/node_modules/@aui.io/apollo-tui/dist/src/lib/actions.d.ts +11 -19
  76. package/node_modules/@aui.io/apollo-tui/dist/src/lib/actions.js +90 -81
  77. package/node_modules/@aui.io/apollo-tui/dist/src/lib/actions.js.map +1 -1
  78. package/node_modules/@aui.io/apollo-tui/dist/src/lib/commands.d.ts +2 -0
  79. package/node_modules/@aui.io/apollo-tui/dist/src/lib/commands.js +6 -6
  80. package/node_modules/@aui.io/apollo-tui/dist/src/lib/commands.js.map +1 -1
  81. package/node_modules/@aui.io/apollo-tui/dist/src/opentui-app.js +21 -13
  82. package/node_modules/@aui.io/apollo-tui/dist/src/opentui-app.js.map +1 -1
  83. package/node_modules/@aui.io/apollo-tui/package.json +2 -2
  84. package/package.json +4 -4
@@ -2,14 +2,16 @@ import { mkdir, unlink, writeFile } from "node:fs/promises";
2
2
  import { homedir } from "node:os";
3
3
  import path from "node:path";
4
4
  import YAML from "yaml";
5
- import { findLiveVersion, } from "../api/management.js";
5
+ import { branchName, continuedName, findLiveVersion, isLiveRef, liveCommitTag, parseVersionTag, } from "../api/management.js";
6
6
  import { diffHashes, diffHashMaps, isClean, readBaseline, writeBaseline, } from "../bundle/baseline.js";
7
7
  import { CERTIFICATION_FILE, hashBuildFiles, readBuildFiles, writeBuildFiles, } from "../bundle/build-area.js";
8
8
  import { hashFiles, readProgramFiles } from "../bundle/files.js";
9
- import { assembleBundle, bundleFileLayout, bundleFiles, writeBundleFiles, } from "../bundle/materialize.js";
9
+ import { assembleFlatBundle, bundleFileLayout, bundleFiles, bundleSecretFiles, withoutSecretBundleFiles, writeBundleFiles, } from "../bundle/materialize.js";
10
10
  import { assertPushableBundle, assertValidProgram, mapRuntimeValidation, } from "../bundle/validate.js";
11
- import { patchBinding, writeBinding, } from "../config/index.js";
12
- import { ApiError, CliError, ConfigError, ValidationError } from "../errors/index.js";
11
+ import { patchBinding, requireUserId, writeBinding, } from "../config/index.js";
12
+ import { ApiError, CliError, ConfigError, NotABranchError, ValidationError, versionMovedFrom, } from "../errors/index.js";
13
+ import { personName } from "../output/index.js";
14
+ import { tagParts } from "../bundle/lineage.js";
13
15
  import { checkoutSchemasDir, installSchemas } from "../schemas/install.js";
14
16
  import { installAgentsPage } from "../skills/agents-page.js";
15
17
  import { installSkills } from "../skills/install.js";
@@ -20,11 +22,33 @@ export function requireAgent(context) {
20
22
  throw new ConfigError("Select or import an agent first.");
21
23
  return context.agentId;
22
24
  }
23
- function requireTag(context, override) {
24
- const tag = override ?? context.versionTag;
25
- if (!tag)
26
- throw new ConfigError("Select a version tag first.");
27
- return tag;
25
+ export function requireTag(context) {
26
+ if (!context.versionTag)
27
+ throw new ConfigError("Select a branch first (`apollo branch use <branch>`).");
28
+ return context.versionTag;
29
+ }
30
+ /** The branch a checkout binds for `ref`, at its newest commit (`live`: the live branch, plus the commit customers get); an older commit throws. */
31
+ export async function resolveBranch(management, agentId, ref, bind, options = {}) {
32
+ const { version, tag } = await management.resolveRef(agentId, ref);
33
+ if (isLiveRef(ref))
34
+ return { version, tag: version.version_tag, live: tag };
35
+ if (tag === version.version_tag)
36
+ return { version, tag };
37
+ const branch = branchName(version);
38
+ throw new NotABranchError({ commit: tag, branch, newest: version.version_tag }, { instead: `${bind} ${branch}`, ...options });
39
+ }
40
+ /** Where a pull lands: `--tag`'s branch, else the pin's branch at its newest commit (every push moves it past the pin). */
41
+ async function pullTarget(management, agentId, asked) {
42
+ if ("branch" in asked)
43
+ return resolveBranch(management, agentId, asked.branch, "apollo pull --tag");
44
+ const version = await management.resolveVersion(agentId, asked.pin);
45
+ return { version, tag: version.version_tag };
46
+ }
47
+ /** The live commit a push onto `branch` leaves behind: set only when live is pinned by tag on this branch. */
48
+ function liveLeftBehind(agent, branch) {
49
+ const tag = agent.live_version_id?.trim();
50
+ const live = tag ? parseVersionTag(tag) : undefined;
51
+ return live?.revision !== undefined && live.major === branch.version_number ? tag : undefined;
28
52
  }
29
53
  /** The checkout root the context is bound to (exported for the sibling
30
54
  * services that anchor per-checkout state there, e.g. the advisor thread). */
@@ -32,6 +56,11 @@ export function agentRoot(context) {
32
56
  return context.agentRoot ??
33
57
  (context.bindingPath ? path.dirname(context.bindingPath) : process.cwd());
34
58
  }
59
+ /** The checkout at `root` as a baseline owner — only the bound checkout's pin is known here. */
60
+ export function baselineCheckout(context, root = agentRoot(context)) {
61
+ const bound = path.resolve(root) === path.resolve(agentRoot(context));
62
+ return bound && context.versionTag ? { root, pinnedTag: context.versionTag } : { root };
63
+ }
35
64
  export function bundleSourceRoot(context, root = agentRoot(context)) {
36
65
  return path.join(root, "bundle", "src");
37
66
  }
@@ -46,7 +75,7 @@ function buildAreaRoot(sourceRoot) {
46
75
  * erase every field context does not carry — the runtime pin first among
47
76
  * them.
48
77
  */
49
- async function updateTag(context, versionTag) {
78
+ export async function updateTag(context, versionTag) {
50
79
  if (!context.bindingPath) {
51
80
  throw new ConfigError("No .apollorc is bound to this working directory.");
52
81
  }
@@ -69,12 +98,12 @@ function formatFileDiff(diff) {
69
98
  ...diff.removed.map((file) => `D ${file}`),
70
99
  ].join("\n");
71
100
  }
72
- async function assertCleanPullDestination(context, root, homeDir) {
101
+ async function assertCleanPullDestination(context, checkout, sourceRoot, homeDir) {
73
102
  const agentId = requireAgent(context);
74
- const baseline = await readBaseline(homeDir, agentId);
103
+ const baseline = await readBaseline(homeDir, agentId, checkout);
75
104
  let currentFiles = {};
76
105
  try {
77
- currentFiles = (await readProgramFiles(root)).files;
106
+ currentFiles = (await readProgramFiles(sourceRoot)).files;
78
107
  }
79
108
  catch (error) {
80
109
  if (error.code !== "ENOENT")
@@ -91,15 +120,38 @@ async function assertCleanPullDestination(context, root, homeDir) {
91
120
  }
92
121
  }
93
122
  /**
94
- * The agent's latest build bundle as bytes, or `undefined` when none exists
95
- * yet (agent-settings answers 404 — a normal state, not an error). File
96
- * bytes are not proxied: the pull response carries short-lived signed URLs,
97
- * downloaded here.
123
+ * Which commit the material that came back belongs with, and whether that is
124
+ * the one the pull asked for.
125
+ *
126
+ * `askedFor` is set ONLY on a mismatch, so a caller can say "this is the
127
+ * material from v3.9, not v3.12" without having to compare the two itself.
128
+ * An unpinned bundle (pushed before the pin existed) names no commit, and a
129
+ * pull cannot tell whether it matches: it is reported as-is, not as a
130
+ * fallback.
131
+ */
132
+ function buildProvenance(got, asked) {
133
+ if (!got)
134
+ return {};
135
+ return { programVersionTag: got, ...(asked && asked !== got ? { askedFor: asked } : {}) };
136
+ }
137
+ /**
138
+ * The build bundle that belongs with the program save being pulled, as bytes,
139
+ * or `undefined` when the agent has none yet (agent-settings answers 404 — a
140
+ * normal state, not an error). File bytes are not proxied: the pull response
141
+ * carries short-lived signed URLs, downloaded here.
142
+ *
143
+ * `programVersionTag` asks for the material pinned to that commit. Upstream
144
+ * falls back — the newest bundle pinned to an earlier commit on the same branch,
145
+ * then the agent's latest push — so the answer says which one it actually
146
+ * gave, and the caller reports a fallback rather than quietly writing
147
+ * material from another save into the checkout.
98
148
  */
99
- async function downloadBuildBundle(agentSettings, agentId, fetchImpl) {
149
+ async function downloadBuildBundle(agentSettings, agentId, fetchImpl, programVersionTag) {
100
150
  let response;
101
151
  try {
102
- response = await agentSettings.pullBuildBundle(agentId);
152
+ response = await agentSettings.pullBuildBundle(agentId, {
153
+ ...(programVersionTag === undefined ? {} : { programVersionTag }),
154
+ });
103
155
  }
104
156
  catch (error) {
105
157
  if (error instanceof ApiError && error.status === 404)
@@ -115,7 +167,8 @@ async function downloadBuildBundle(agentSettings, agentId, fetchImpl) {
115
167
  }
116
168
  files[relativePath] = Buffer.from(await download.arrayBuffer());
117
169
  }));
118
- return { version: response.bundle.version, files };
170
+ const pinned = response.bundle.program_version_tag ?? undefined;
171
+ return { version: response.bundle.version, files, ...(pinned ? { programVersionTag: pinned } : {}) };
119
172
  }
120
173
  /** The build-area dirty check — same contract as the program one: local
121
174
  * edits the baseline does not know about block a sync that would overwrite
@@ -137,85 +190,84 @@ function prefixDiff(diff, prefix) {
137
190
  }
138
191
  export async function pullBundle(context, clients, options = {}) {
139
192
  const agentId = requireAgent(context);
140
- const tag = requireTag(context, options.tag);
193
+ const asked = options.tag === undefined ? { pin: requireTag(context) } : { branch: options.tag };
141
194
  const homeDir = options.homeDir ?? homedir();
142
195
  const root = options.destination ?? agentRoot(context);
196
+ const checkout = baselineCheckout(context, root);
143
197
  const destination = bundleSourceRoot(context, root);
144
198
  const buildDir = buildAreaRoot(destination);
145
199
  if (!options.force) {
146
- await assertCleanPullDestination(context, destination, homeDir);
200
+ await assertCleanPullDestination(context, checkout, destination, homeDir);
147
201
  }
202
+ const target = await pullTarget(clients.management, agentId, asked);
148
203
  // The two lanes are independent remotes — fetch them together, write only
149
204
  // after BOTH dirty checks pass, so a refusal never leaves a half-synced
150
205
  // checkout.
151
206
  const [pull, remoteBuild] = await Promise.all([
152
- pullVersionByTag(clients.management, agentId, tag),
153
- downloadBuildBundle(clients.agentSettings, agentId, options.fetch ?? globalThis.fetch),
207
+ clients.management.pullVersion(agentId, target.version.id, target.tag),
208
+ // The build lane follows the program: ask for the material that belongs
209
+ // with the commit being pulled, not for whatever was pushed last.
210
+ downloadBuildBundle(clients.agentSettings, agentId, options.fetch ?? globalThis.fetch, target.tag),
154
211
  ]);
155
212
  if (remoteBuild && !options.force) {
156
- const baseline = await readBaseline(homeDir, agentId);
213
+ const baseline = await readBaseline(homeDir, agentId, checkout);
157
214
  await assertCleanBuildArea(buildDir, baseline?.buildHashes ?? {});
158
215
  }
159
216
  const files = bundleFiles(pull.bundle);
217
+ const serverSecretFiles = bundleSecretFiles(pull.bundle);
218
+ // What the result echoes: a secret the commit still holds never reaches output.
219
+ const pulled = { ...pull, bundle: withoutSecretBundleFiles(pull.bundle) };
160
220
  const written = await writeBundleFiles(destination, files);
161
221
  const buildSync = remoteBuild
162
- ? { version: remoteBuild.version, ...(await writeBuildFiles(buildDir, remoteBuild.files)) }
222
+ ? {
223
+ version: remoteBuild.version,
224
+ ...(await writeBuildFiles(buildDir, remoteBuild.files)),
225
+ ...buildProvenance(remoteBuild.programVersionTag, pull.version_tag),
226
+ }
163
227
  : undefined;
164
228
  await updateTag(context, pull.version_tag);
165
229
  // On a 404 the baseline records an EMPTY area even when local files exist:
166
230
  // they are unpushed work, and recording them would make `apollo push`
167
231
  // read the area as clean and never publish it.
168
- await writeBaseline(homeDir, agentId, pull.version_tag, files, bundleFileLayout(pull.bundle), remoteBuild ? hashBuildFiles(remoteBuild.files) : {});
232
+ await writeBaseline(homeDir, agentId, root, pull.version_tag, files, bundleFileLayout(pulled.bundle), remoteBuild ? hashBuildFiles(remoteBuild.files) : {});
169
233
  return {
170
- pull,
234
+ pull: pulled,
171
235
  files,
172
236
  removed: written.removed,
173
237
  ...(buildSync ? { build: buildSync } : {}),
238
+ ...(target.live ? { live: target.live } : {}),
239
+ ...(serverSecretFiles.length ? { serverSecretFiles } : {}),
174
240
  };
175
241
  }
176
- /**
177
- * Resolve a tag and pull the revision the resolution LANDED on — never the
178
- * tag as asked. Each push bumps the revision on the same version id, so a
179
- * checkout's pin goes stale the moment anyone else pushes (`.apollorc` says
180
- * `v1.46` while the row now reads `v1.47`); `resolveVersion` follows that to
181
- * the tip of the major line, and the pull has to follow it too. Re-sending
182
- * the stale tag made agent-settings serve the OLD revision and echo the old
183
- * tag back, so `apollo pull` rewrote `.apollorc` with the tag it already had
184
- * and never advanced — while `diff --remote` (untagged) compared against the
185
- * tip, and `version get` reported the tip. One resolution, one answer.
186
- */
187
- async function pullVersionByTag(management, agentId, tag) {
188
- const version = await management.resolveVersion(agentId, tag);
189
- return management.pullVersion(agentId, version.id, version.version_tag);
190
- }
191
242
  export async function importBundle(context, clients, agentId, destination, options = {}) {
192
243
  const { tag, runtimeVersion } = options;
193
244
  const { management } = clients;
194
245
  const homeDir = options.homeDir ?? homedir();
195
- // The build lane is an independent remote — start its download alongside
196
- // the version resolution chain.
197
- const buildPromise = downloadBuildBundle(clients.agentSettings, agentId, options.fetch ?? globalThis.fetch);
198
246
  const agent = await management.getAgent(agentId);
199
- let selectedTag = tag;
200
- if (!selectedTag && agent.live_version_id) {
201
- // `live_version_id` may hold a version id or a tag — findLiveVersion
202
- // matches both shapes (REPORTS-26 defect 2).
203
- const versions = await management.listVersions(agentId);
204
- selectedTag = findLiveVersion(agent, versions.results)?.version_tag;
247
+ if (!tag && !agent.live_version_id) {
248
+ throw new ConfigError("The agent has nothing live yet; pass --tag to name a branch.");
205
249
  }
206
- if (!selectedTag)
207
- throw new ConfigError("The agent has no live version; pass --tag.");
250
+ // Without --tag, the live branch at its newest commit: a checkout of an older live commit could not push.
251
+ const target = await resolveBranch(management, agentId, tag ?? "live", `apollo agent import ${agentId} --tag`, {
252
+ inCheckoutAfter: true,
253
+ });
254
+ // The build lane starts AFTER the save is known: it follows the program,
255
+ // and asking before the tag is resolved could only ask for "the latest".
208
256
  const [pull, remoteBuild] = await Promise.all([
209
- pullVersionByTag(management, agentId, selectedTag),
210
- buildPromise,
257
+ management.pullVersion(agentId, target.version.id, target.tag),
258
+ downloadBuildBundle(clients.agentSettings, agentId, options.fetch ?? globalThis.fetch, target.tag),
211
259
  ]);
212
260
  const files = bundleFiles(pull.bundle);
261
+ const serverSecretFiles = bundleSecretFiles(pull.bundle);
262
+ // What the result echoes: a secret the commit still holds never reaches output.
263
+ const pulled = { ...pull, bundle: withoutSecretBundleFiles(pull.bundle) };
213
264
  const sourceRoot = bundleSourceRoot(context, destination);
214
265
  await writeBundleFiles(sourceRoot, files);
215
266
  const buildSync = remoteBuild
216
267
  ? {
217
268
  version: remoteBuild.version,
218
269
  ...(await writeBuildFiles(buildAreaRoot(sourceRoot), remoteBuild.files)),
270
+ ...buildProvenance(remoteBuild.programVersionTag, pull.version_tag),
219
271
  }
220
272
  : undefined;
221
273
  const binding = {
@@ -230,8 +282,15 @@ export async function importBundle(context, clients, agentId, destination, optio
230
282
  environment: context.environment,
231
283
  };
232
284
  await writeBinding(path.join(destination, ".apollorc"), binding);
233
- await writeBaseline(homeDir, agent.id, pull.version_tag, files, bundleFileLayout(pull.bundle), remoteBuild ? hashBuildFiles(remoteBuild.files) : {});
234
- return { pull, files, binding, ...(buildSync ? { build: buildSync } : {}) };
285
+ await writeBaseline(homeDir, agent.id, destination, pull.version_tag, files, bundleFileLayout(pulled.bundle), remoteBuild ? hashBuildFiles(remoteBuild.files) : {});
286
+ return {
287
+ pull: pulled,
288
+ files,
289
+ binding,
290
+ ...(buildSync ? { build: buildSync } : {}),
291
+ ...(target.live ? { live: target.live } : {}),
292
+ ...(serverSecretFiles.length ? { serverSecretFiles } : {}),
293
+ };
235
294
  }
236
295
  /** Skill packs a checkout gets unless the caller narrows or disables them. */
237
296
  export const DEFAULT_SKILL_TARGETS = ["cursor", "claude"];
@@ -408,7 +467,7 @@ async function removeIfPresent(target) {
408
467
  * and pull dirty-guard messages. */
409
468
  export async function localDiff(context, root = bundleSourceRoot(context), homeDir = homedir()) {
410
469
  const agentId = requireAgent(context);
411
- const baseline = await readBaseline(homeDir, agentId);
470
+ const baseline = await readBaseline(homeDir, agentId, baselineCheckout(context));
412
471
  if (!baseline)
413
472
  throw new ConfigError("No import/pull/push baseline exists yet.");
414
473
  const current = await readProgramFiles(root);
@@ -490,7 +549,8 @@ export async function pushBundle(context, clients, options = {}) {
490
549
  const bundleAudit = audited.bundle;
491
550
  const build = await readBuildFiles(buildAreaRoot(root));
492
551
  const buildHashes = hashBuildFiles(build.files);
493
- const baseline = await readBaseline(homeDir, agentId);
552
+ const checkoutRoot = agentRoot(context);
553
+ const baseline = await readBaseline(homeDir, agentId, baselineCheckout(context, checkoutRoot));
494
554
  const diff = diffHashes(baseline?.files ?? {}, program.files);
495
555
  const buildDiff = diffHashMaps(baseline?.buildHashes ?? {}, buildHashes);
496
556
  const pinned = context.runtimeVersion
@@ -507,27 +567,85 @@ export async function pushBundle(context, clients, options = {}) {
507
567
  };
508
568
  }
509
569
  let push;
570
+ let live;
571
+ let newBranch;
510
572
  let versionTag = baseline?.versionTag ?? requireTag(context);
511
573
  let fileLayout = baseline?.fileLayout;
512
574
  if (!isClean(diff)) {
513
575
  const baseTag = requireTag(context);
514
- const base = await clients.management.resolveVersion(agentId, baseTag);
515
- const draft = base.status === "draft"
576
+ const [base, agent] = await Promise.all([
577
+ clients.management.resolveVersion(agentId, baseTag),
578
+ clients.management.getAgent(agentId),
579
+ ]);
580
+ const actor = requireUserId(context, "push");
581
+ // The save these changes are BASED ON: what the baseline recorded at the
582
+ // last pull/push. The binding's tag is normally the same save; when it
583
+ // is not (a stale pin the resolve followed to the tip), the baseline is
584
+ // the truth about what the working tree started from. With no baseline
585
+ // the pin is — never the tip the resolve followed it to.
586
+ const basedOn = baseline?.versionTag ?? baseTag;
587
+ const basedOnThisLine = (() => {
588
+ try {
589
+ return tagParts(basedOn)[0] === base.version_number;
590
+ }
591
+ catch {
592
+ return false;
593
+ }
594
+ })();
595
+ const wantsNewVersion = options.newVersion !== undefined && options.newVersion !== false;
596
+ if (!basedOnThisLine && !wantsNewVersion) {
597
+ throw new ConfigError(`This checkout's changes are based on ${basedOn}, which is not on the bound branch v${base.version_number}.`, `\`apollo push --new-version\` pushes them as a new branch cut from ${basedOn}; ` +
598
+ `\`apollo pull\` replaces them with v${base.version_number}'s newest commit (--force discards your edits).`);
599
+ }
600
+ // The branch the changes came from: the bound one, or the other branch
601
+ // whose commit a new version is cut from.
602
+ const from = basedOnThisLine ? base : await clients.management.resolveVersion(agentId, basedOn);
603
+ const newVersionName = typeof options.newVersion === "string" && options.newVersion.trim()
604
+ ? options.newVersion.trim()
605
+ : continuedName(from);
606
+ // A locked line takes no pushes; a new draft cut from the commit the
607
+ // changes are based on takes them instead — the same for --new-version.
608
+ const draft = base.status === "draft" && !wantsNewVersion
516
609
  ? base
517
610
  : await clients.management.createVersion(agentId, {
518
611
  source: "version",
519
- fromVersion: base.id,
520
- label: `Draft from ${base.version_tag}`,
612
+ createdBy: actor,
613
+ fromVersion: from.id,
614
+ fromVersionTag: basedOn,
615
+ label: newVersionName,
521
616
  });
522
- const bundle = assembleBundle(program.files, baseline?.fileLayout);
617
+ const bundle = assembleFlatBundle(program.files);
618
+ // The push declares the commit it starts from: for a fresh draft, the
619
+ // draft's own first save (its copy of the base); otherwise the base.
620
+ const pushBase = draft.id === base.id ? basedOn : draft.version_tag;
523
621
  // The revision records the engine build it targets: the checkout's pin
524
622
  // (flag > env > `.apollorc`) rides the push body as `runtime_version`,
525
623
  // the same value the pre-flight validate above was routed to.
526
- push = await clients.management.pushVersion(agentId, draft.id, bundle, options.commitMessage, context.runtimeVersion);
624
+ try {
625
+ push = await clients.management.pushVersion(agentId, draft.id, bundle, actor, options.commitMessage, context.runtimeVersion, pushBase);
626
+ }
627
+ catch (error) {
628
+ // Someone pushed after this checkout started: the refusal names the
629
+ // save that moved the line and the two ways out. Never retried.
630
+ const moved = versionMovedFrom(error, { newVersionName, me: actor });
631
+ if (moved)
632
+ throw moved;
633
+ throw error;
634
+ }
527
635
  versionTag = push.new_version_tag;
528
- fileLayout = bundleFileLayout(bundle);
636
+ live = liveLeftBehind(agent, draft);
637
+ if (draft.id !== base.id) {
638
+ newBranch = {
639
+ branch: branchName(draft),
640
+ label: draft.label?.trim() || newVersionName,
641
+ from: basedOn,
642
+ ...(wantsNewVersion ? {} : { closed: { branch: branchName(base), status: base.status } }),
643
+ };
644
+ }
645
+ // Flat files ride the wire now — there is no pointer layout to keep.
646
+ fileLayout = undefined;
529
647
  await updateTag(context, versionTag);
530
- await writeBaseline(homeDir, agentId, versionTag, program.files, fileLayout, baseline?.buildHashes ?? {});
648
+ await writeBaseline(homeDir, agentId, checkoutRoot, versionTag, program.files, fileLayout, baseline?.buildHashes ?? {});
531
649
  }
532
650
  let buildPush;
533
651
  if (!isClean(buildDiff)) {
@@ -538,20 +656,29 @@ export async function pushBundle(context, clients, options = {}) {
538
656
  }
539
657
  // A build bundle is a full snapshot, not a delta: every file in the
540
658
  // area ships, and the new version replaces the old one wholesale.
659
+ //
660
+ // IN THIS ORDER, and only in this order: the program push above is what
661
+ // MINTS the commit this material belongs with, so the pin can only be named
662
+ // once it has answered. `versionTag` is that commit — the push's new tag, or
663
+ // the checkout's pin when the program did not change, which is still the
664
+ // save this material describes.
541
665
  buildPush = await clients.agentSettings.pushBuildBundle(agentId, {
542
666
  files: Object.entries(build.files).map(([relativePath, content]) => ({
543
667
  path: relativePath,
544
668
  content,
545
669
  })),
546
670
  createdBy: context.userId ?? "apollo-cli",
671
+ ...(versionTag ? { programVersionTag: versionTag } : {}),
547
672
  ...(options.commitMessage ? { notes: options.commitMessage } : {}),
548
673
  });
549
- await writeBaseline(homeDir, agentId, versionTag, program.files, fileLayout, buildHashes);
674
+ await writeBaseline(homeDir, agentId, checkoutRoot, versionTag, program.files, fileLayout, buildHashes);
550
675
  }
551
676
  return {
552
677
  diff,
553
678
  buildDiff,
554
679
  ...(push ? { push } : {}),
680
+ ...(live ? { live } : {}),
681
+ ...(newBranch ? { newBranch } : {}),
555
682
  ...(buildPush ? { buildPush } : {}),
556
683
  validation,
557
684
  bundle: bundleAudit,
@@ -671,7 +798,35 @@ export async function applyBundleFixes(fixes, root) {
671
798
  }
672
799
  return touched;
673
800
  }
801
+ /** The agent's versions, and the commit it serves (`null` while nothing is live). */
674
802
  export async function listVersions(context, management) {
675
- return management.listVersions(requireAgent(context));
803
+ const agentId = requireAgent(context);
804
+ const [page, agent] = await Promise.all([management.listVersions(agentId), management.getAgent(agentId)]);
805
+ const live = findLiveVersion(agent, page.results);
806
+ return { ...page, live_version_tag: live ? liveCommitTag(agent, live) : null };
807
+ }
808
+ /** The newest `limit` commits of the branch `ref` names (else the checkout's), and how many it has. */
809
+ export async function branchLog(context, management, options) {
810
+ const agentId = requireAgent(context);
811
+ const [branch, agent] = await Promise.all([
812
+ management.resolveVersion(agentId, options.ref ?? requireTag(context)),
813
+ management.getAgent(agentId),
814
+ ]);
815
+ const page = await management.listRevisions(agentId, branch.id, options.limit);
816
+ const onBranch = findLiveVersion(agent, [branch]);
817
+ const live = onBranch ? liveCommitTag(agent, onBranch) : null;
818
+ return {
819
+ branch,
820
+ live,
821
+ commits: page.results.map((revision) => ({
822
+ tag: revision.version_tag,
823
+ created_at: revision.created_at,
824
+ author: personName(revision.created_by, revision.created_by_email, context.userId),
825
+ message: revision.commit_message ?? null,
826
+ newest: revision.version_tag === branch.version_tag,
827
+ live: revision.version_tag === live,
828
+ })),
829
+ total: page.total,
830
+ };
676
831
  }
677
832
  //# sourceMappingURL=bundles.js.map
@@ -1 +1 @@
1
- {"version":3,"file":"bundles.js","sourceRoot":"","sources":["../../../src/services/bundles.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"bundles.js","sourceRoot":"","sources":["../../../src/services/bundles.ts"],"names":[],"mappings":"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"}
@@ -23,8 +23,10 @@ import { readdir, readFile, realpath, stat } from "node:fs/promises";
23
23
  import { execFile } from "node:child_process";
24
24
  import { homedir } from "node:os";
25
25
  import path from "node:path";
26
+ import { findBaseline } from "../bundle/baseline.js";
26
27
  import { apolloDir } from "../config/store.js";
27
28
  import { checkoutAlive, registryFile, } from "../checkouts/registry.js";
29
+ import { baselineCheckout } from "./bundles.js";
28
30
  import { getStatus } from "./status.service.js";
29
31
  import { resolvePublishedVersion } from "./upgrade.js";
30
32
  const MIN_NODE_MAJOR = 20;
@@ -378,7 +380,7 @@ async function checkoutChecks(add, context, home, status, offline) {
378
380
  ? {}
379
381
  : {
380
382
  note: "pull/push will resolve a version implicitly",
381
- suggestion: "apollo version use <tag>",
383
+ suggestion: "apollo branch use <tag>",
382
384
  }),
383
385
  });
384
386
  runtimePinCheck(add, context, status, offline);
@@ -428,8 +430,7 @@ async function checkoutChecks(add, context, home, status, offline) {
428
430
  }),
429
431
  });
430
432
  if (programOk && context.agentId) {
431
- const baseline = path.join(apolloDir(home), "baselines", context.agentId, "baseline.json");
432
- const baselineOk = await exists(baseline);
433
+ const baselineOk = (await findBaseline(home, context.agentId, baselineCheckout(context))) !== null;
433
434
  add({
434
435
  id: "baseline",
435
436
  section: "checkout",