@oscharko-dev/keiko 1.0.3 → 1.0.5

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 (175) hide show
  1. package/dist/cli/index.js +10 -6
  2. package/dist/ui/csp-hashes.json +6 -6
  3. package/dist/ui/static/404.html +1 -1
  4. package/dist/ui/static/__next.__PAGE__.txt +2 -2
  5. package/dist/ui/static/__next._full.txt +3 -3
  6. package/dist/ui/static/__next._tree.txt +1 -1
  7. package/dist/ui/static/_next/static/chunks/{2aebtbzatv9jb.js → 1yj6x688jjk-a.js} +1 -1
  8. package/dist/ui/static/_next/static/chunks/{2_-v-c9bsad3u.js → 3f_-h2lm9ml4b.js} +1 -1
  9. package/dist/ui/static/_not-found/__next._full.txt +1 -1
  10. package/dist/ui/static/_not-found/__next._not-found.__PAGE__.txt +1 -1
  11. package/dist/ui/static/_not-found/__next._tree.txt +1 -1
  12. package/dist/ui/static/_not-found.html +1 -1
  13. package/dist/ui/static/_not-found.txt +1 -1
  14. package/dist/ui/static/atlassian-connectors/__next._full.txt +1 -1
  15. package/dist/ui/static/atlassian-connectors/__next._tree.txt +1 -1
  16. package/dist/ui/static/atlassian-connectors/__next.atlassian-connectors.__PAGE__.txt +1 -1
  17. package/dist/ui/static/atlassian-connectors.html +1 -1
  18. package/dist/ui/static/atlassian-connectors.txt +1 -1
  19. package/dist/ui/static/index.html +1 -1
  20. package/dist/ui/static/index.txt +3 -3
  21. package/dist/ui/static/launch/__next._full.txt +3 -3
  22. package/dist/ui/static/launch/__next._tree.txt +1 -1
  23. package/dist/ui/static/launch/__next.launch.__PAGE__.txt +2 -2
  24. package/dist/ui/static/launch.html +1 -1
  25. package/dist/ui/static/launch.txt +3 -3
  26. package/dist/ui/static/local-knowledge/__next._full.txt +3 -3
  27. package/dist/ui/static/local-knowledge/__next._tree.txt +1 -1
  28. package/dist/ui/static/local-knowledge/__next.local-knowledge.__PAGE__.txt +2 -2
  29. package/dist/ui/static/local-knowledge/capsule/__next._full.txt +1 -1
  30. package/dist/ui/static/local-knowledge/capsule/__next._tree.txt +1 -1
  31. package/dist/ui/static/local-knowledge/capsule/__next.local-knowledge.capsule.__PAGE__.txt +1 -1
  32. package/dist/ui/static/local-knowledge/capsule.html +1 -1
  33. package/dist/ui/static/local-knowledge/capsule.txt +1 -1
  34. package/dist/ui/static/local-knowledge.html +1 -1
  35. package/dist/ui/static/local-knowledge.txt +3 -3
  36. package/node_modules/@oscharko-dev/keiko-cli/dist/audit.d.ts +5 -0
  37. package/node_modules/@oscharko-dev/keiko-cli/dist/audit.d.ts.map +1 -1
  38. package/node_modules/@oscharko-dev/keiko-cli/dist/audit.js +109 -11
  39. package/node_modules/@oscharko-dev/keiko-cli/dist/cli-control-state.d.ts +13 -0
  40. package/node_modules/@oscharko-dev/keiko-cli/dist/cli-control-state.d.ts.map +1 -0
  41. package/node_modules/@oscharko-dev/keiko-cli/dist/cli-control-state.js +47 -0
  42. package/node_modules/@oscharko-dev/keiko-cli/dist/index.d.ts +1 -0
  43. package/node_modules/@oscharko-dev/keiko-cli/dist/index.d.ts.map +1 -1
  44. package/node_modules/@oscharko-dev/keiko-cli/dist/index.js +1 -0
  45. package/node_modules/@oscharko-dev/keiko-cli/dist/install-layout.d.ts +28 -0
  46. package/node_modules/@oscharko-dev/keiko-cli/dist/install-layout.d.ts.map +1 -1
  47. package/node_modules/@oscharko-dev/keiko-cli/dist/install-layout.js +71 -0
  48. package/node_modules/@oscharko-dev/keiko-cli/dist/launcher.d.ts.map +1 -1
  49. package/node_modules/@oscharko-dev/keiko-cli/dist/launcher.js +2 -1
  50. package/node_modules/@oscharko-dev/keiko-cli/dist/lifecycle.d.ts.map +1 -1
  51. package/node_modules/@oscharko-dev/keiko-cli/dist/lifecycle.js +2 -1
  52. package/node_modules/@oscharko-dev/keiko-cli/dist/portable.d.ts.map +1 -1
  53. package/node_modules/@oscharko-dev/keiko-cli/dist/portable.js +11 -0
  54. package/node_modules/@oscharko-dev/keiko-cli/dist/repair.d.ts.map +1 -1
  55. package/node_modules/@oscharko-dev/keiko-cli/dist/repair.js +7 -2
  56. package/node_modules/@oscharko-dev/keiko-cli/dist/runner.d.ts.map +1 -1
  57. package/node_modules/@oscharko-dev/keiko-cli/dist/runner.js +81 -34
  58. package/node_modules/@oscharko-dev/keiko-cli/dist/security-log.d.ts +1 -1
  59. package/node_modules/@oscharko-dev/keiko-cli/dist/security-log.d.ts.map +1 -1
  60. package/node_modules/@oscharko-dev/keiko-cli/dist/security-log.js +2 -3
  61. package/node_modules/@oscharko-dev/keiko-cli/dist/support.d.ts +5 -0
  62. package/node_modules/@oscharko-dev/keiko-cli/dist/support.d.ts.map +1 -1
  63. package/node_modules/@oscharko-dev/keiko-cli/dist/support.js +65 -3
  64. package/node_modules/@oscharko-dev/keiko-cli/dist/ui.d.ts +2 -0
  65. package/node_modules/@oscharko-dev/keiko-cli/dist/ui.d.ts.map +1 -1
  66. package/node_modules/@oscharko-dev/keiko-cli/dist/ui.js +14 -13
  67. package/node_modules/@oscharko-dev/keiko-cli/dist/uninstall.d.ts +1 -0
  68. package/node_modules/@oscharko-dev/keiko-cli/dist/uninstall.d.ts.map +1 -1
  69. package/node_modules/@oscharko-dev/keiko-cli/dist/uninstall.js +236 -69
  70. package/node_modules/@oscharko-dev/keiko-cli/dist/update.d.ts.map +1 -1
  71. package/node_modules/@oscharko-dev/keiko-cli/dist/update.js +2 -0
  72. package/node_modules/@oscharko-dev/keiko-cli/package.json +14 -14
  73. package/node_modules/@oscharko-dev/keiko-connectors/dist/version.d.ts +1 -1
  74. package/node_modules/@oscharko-dev/keiko-connectors/dist/version.js +1 -1
  75. package/node_modules/@oscharko-dev/keiko-connectors/package.json +3 -3
  76. package/node_modules/@oscharko-dev/keiko-contracts/dist/governed-tool-lifecycle.d.ts +1 -1
  77. package/node_modules/@oscharko-dev/keiko-contracts/dist/governed-tool-lifecycle.d.ts.map +1 -1
  78. package/node_modules/@oscharko-dev/keiko-contracts/dist/prompt-enhancer-analyzer-benchmark-fixture.d.ts +10 -0
  79. package/node_modules/@oscharko-dev/keiko-contracts/dist/prompt-enhancer-analyzer-benchmark-fixture.d.ts.map +1 -0
  80. package/node_modules/@oscharko-dev/keiko-contracts/dist/prompt-enhancer-analyzer-benchmark-fixture.js +63 -0
  81. package/node_modules/@oscharko-dev/keiko-contracts/dist/prompt-enhancer-analyzer.d.ts +1 -0
  82. package/node_modules/@oscharko-dev/keiko-contracts/dist/prompt-enhancer-analyzer.d.ts.map +1 -1
  83. package/node_modules/@oscharko-dev/keiko-contracts/dist/prompt-enhancer-analyzer.js +29 -1
  84. package/node_modules/@oscharko-dev/keiko-contracts/dist/version.d.ts +2 -2
  85. package/node_modules/@oscharko-dev/keiko-contracts/dist/version.js +2 -2
  86. package/node_modules/@oscharko-dev/keiko-contracts/package.json +1 -1
  87. package/node_modules/@oscharko-dev/keiko-evaluations/package.json +9 -9
  88. package/node_modules/@oscharko-dev/keiko-evidence/dist/version.d.ts +1 -1
  89. package/node_modules/@oscharko-dev/keiko-evidence/dist/version.js +1 -1
  90. package/node_modules/@oscharko-dev/keiko-evidence/package.json +4 -4
  91. package/node_modules/@oscharko-dev/keiko-git/dist/version.d.ts +1 -1
  92. package/node_modules/@oscharko-dev/keiko-git/dist/version.js +1 -1
  93. package/node_modules/@oscharko-dev/keiko-git/package.json +1 -1
  94. package/node_modules/@oscharko-dev/keiko-harness/dist/version.d.ts +1 -1
  95. package/node_modules/@oscharko-dev/keiko-harness/dist/version.js +1 -1
  96. package/node_modules/@oscharko-dev/keiko-harness/package.json +7 -7
  97. package/node_modules/@oscharko-dev/keiko-local-knowledge/dist/version.d.ts +1 -1
  98. package/node_modules/@oscharko-dev/keiko-local-knowledge/dist/version.js +1 -1
  99. package/node_modules/@oscharko-dev/keiko-local-knowledge/package.json +6 -6
  100. package/node_modules/@oscharko-dev/keiko-memory-capture/dist/version.d.ts +1 -1
  101. package/node_modules/@oscharko-dev/keiko-memory-capture/dist/version.js +1 -1
  102. package/node_modules/@oscharko-dev/keiko-memory-capture/package.json +3 -3
  103. package/node_modules/@oscharko-dev/keiko-memory-consolidation/dist/version.d.ts +1 -1
  104. package/node_modules/@oscharko-dev/keiko-memory-consolidation/dist/version.js +1 -1
  105. package/node_modules/@oscharko-dev/keiko-memory-consolidation/package.json +3 -3
  106. package/node_modules/@oscharko-dev/keiko-memory-governance/dist/version.d.ts +1 -1
  107. package/node_modules/@oscharko-dev/keiko-memory-governance/dist/version.js +1 -1
  108. package/node_modules/@oscharko-dev/keiko-memory-governance/package.json +3 -3
  109. package/node_modules/@oscharko-dev/keiko-memory-retrieval/dist/version.d.ts +1 -1
  110. package/node_modules/@oscharko-dev/keiko-memory-retrieval/dist/version.js +1 -1
  111. package/node_modules/@oscharko-dev/keiko-memory-retrieval/package.json +3 -3
  112. package/node_modules/@oscharko-dev/keiko-memory-vault/dist/version.d.ts +1 -1
  113. package/node_modules/@oscharko-dev/keiko-memory-vault/dist/version.js +1 -1
  114. package/node_modules/@oscharko-dev/keiko-memory-vault/package.json +3 -3
  115. package/node_modules/@oscharko-dev/keiko-model-gateway/dist/version.d.ts +1 -1
  116. package/node_modules/@oscharko-dev/keiko-model-gateway/dist/version.js +1 -1
  117. package/node_modules/@oscharko-dev/keiko-model-gateway/package.json +4 -4
  118. package/node_modules/@oscharko-dev/keiko-quality-intelligence/package.json +3 -3
  119. package/node_modules/@oscharko-dev/keiko-sandbox/package.json +2 -2
  120. package/node_modules/@oscharko-dev/keiko-sdk/package.json +9 -9
  121. package/node_modules/@oscharko-dev/keiko-security/dist/version.d.ts +1 -1
  122. package/node_modules/@oscharko-dev/keiko-security/dist/version.js +1 -1
  123. package/node_modules/@oscharko-dev/keiko-security/package.json +2 -2
  124. package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/opencodeRuntimeAdapter.d.ts.map +1 -1
  125. package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/opencodeRuntimeAdapter.js +16 -6
  126. package/node_modules/@oscharko-dev/keiko-server/dist/coding-runtime/productionOpenCodeBackend.js +9 -5
  127. package/node_modules/@oscharko-dev/keiko-server/dist/task-workspace/reconciliation-gitdir-pointer-benchmark-fixture.d.ts +3 -0
  128. package/node_modules/@oscharko-dev/keiko-server/dist/task-workspace/reconciliation-gitdir-pointer-benchmark-fixture.d.ts.map +1 -0
  129. package/node_modules/@oscharko-dev/keiko-server/dist/task-workspace/reconciliation-gitdir-pointer-benchmark-fixture.js +5 -0
  130. package/node_modules/@oscharko-dev/keiko-server/package.json +22 -22
  131. package/node_modules/@oscharko-dev/keiko-tool-catalog/dist/catalog.d.ts.map +1 -1
  132. package/node_modules/@oscharko-dev/keiko-tool-catalog/dist/catalog.js +14 -2
  133. package/node_modules/@oscharko-dev/keiko-tool-catalog/package.json +3 -3
  134. package/node_modules/@oscharko-dev/keiko-tools/dist/version.d.ts +1 -1
  135. package/node_modules/@oscharko-dev/keiko-tools/dist/version.js +1 -1
  136. package/node_modules/@oscharko-dev/keiko-tools/package.json +7 -7
  137. package/node_modules/@oscharko-dev/keiko-verification/package.json +5 -5
  138. package/node_modules/@oscharko-dev/keiko-workflows/package.json +10 -10
  139. package/node_modules/@oscharko-dev/keiko-workspace/dist/version.d.ts +1 -1
  140. package/node_modules/@oscharko-dev/keiko-workspace/dist/version.js +1 -1
  141. package/node_modules/@oscharko-dev/keiko-workspace/package.json +3 -3
  142. package/package.json +39 -38
  143. package/release-impact.catalog.json +108 -0
  144. package/vendor/oscharko-dev-keiko-cli-1.0.5.tgz +0 -0
  145. package/vendor/{oscharko-dev-keiko-connectors-1.0.3.tgz → oscharko-dev-keiko-connectors-1.0.5.tgz} +0 -0
  146. package/vendor/oscharko-dev-keiko-contracts-1.0.5.tgz +0 -0
  147. package/vendor/{oscharko-dev-keiko-evaluations-1.0.3.tgz → oscharko-dev-keiko-evaluations-1.0.5.tgz} +0 -0
  148. package/vendor/{oscharko-dev-keiko-evidence-1.0.3.tgz → oscharko-dev-keiko-evidence-1.0.5.tgz} +0 -0
  149. package/vendor/{oscharko-dev-keiko-git-1.0.3.tgz → oscharko-dev-keiko-git-1.0.5.tgz} +0 -0
  150. package/vendor/{oscharko-dev-keiko-harness-1.0.3.tgz → oscharko-dev-keiko-harness-1.0.5.tgz} +0 -0
  151. package/vendor/{oscharko-dev-keiko-local-knowledge-1.0.3.tgz → oscharko-dev-keiko-local-knowledge-1.0.5.tgz} +0 -0
  152. package/vendor/{oscharko-dev-keiko-memory-capture-1.0.3.tgz → oscharko-dev-keiko-memory-capture-1.0.5.tgz} +0 -0
  153. package/vendor/{oscharko-dev-keiko-memory-consolidation-1.0.3.tgz → oscharko-dev-keiko-memory-consolidation-1.0.5.tgz} +0 -0
  154. package/vendor/{oscharko-dev-keiko-memory-governance-1.0.3.tgz → oscharko-dev-keiko-memory-governance-1.0.5.tgz} +0 -0
  155. package/vendor/{oscharko-dev-keiko-memory-retrieval-1.0.3.tgz → oscharko-dev-keiko-memory-retrieval-1.0.5.tgz} +0 -0
  156. package/vendor/{oscharko-dev-keiko-memory-vault-1.0.3.tgz → oscharko-dev-keiko-memory-vault-1.0.5.tgz} +0 -0
  157. package/vendor/{oscharko-dev-keiko-model-gateway-1.0.3.tgz → oscharko-dev-keiko-model-gateway-1.0.5.tgz} +0 -0
  158. package/vendor/{oscharko-dev-keiko-quality-intelligence-1.0.3.tgz → oscharko-dev-keiko-quality-intelligence-1.0.5.tgz} +0 -0
  159. package/vendor/oscharko-dev-keiko-sandbox-1.0.5.tgz +0 -0
  160. package/vendor/oscharko-dev-keiko-sdk-1.0.5.tgz +0 -0
  161. package/vendor/{oscharko-dev-keiko-security-1.0.3.tgz → oscharko-dev-keiko-security-1.0.5.tgz} +0 -0
  162. package/vendor/{oscharko-dev-keiko-server-1.0.3.tgz → oscharko-dev-keiko-server-1.0.5.tgz} +0 -0
  163. package/vendor/oscharko-dev-keiko-tool-catalog-1.0.5.tgz +0 -0
  164. package/vendor/{oscharko-dev-keiko-tools-1.0.3.tgz → oscharko-dev-keiko-tools-1.0.5.tgz} +0 -0
  165. package/vendor/{oscharko-dev-keiko-verification-1.0.3.tgz → oscharko-dev-keiko-verification-1.0.5.tgz} +0 -0
  166. package/vendor/{oscharko-dev-keiko-workflows-1.0.3.tgz → oscharko-dev-keiko-workflows-1.0.5.tgz} +0 -0
  167. package/vendor/{oscharko-dev-keiko-workspace-1.0.3.tgz → oscharko-dev-keiko-workspace-1.0.5.tgz} +0 -0
  168. package/vendor/oscharko-dev-keiko-cli-1.0.3.tgz +0 -0
  169. package/vendor/oscharko-dev-keiko-contracts-1.0.3.tgz +0 -0
  170. package/vendor/oscharko-dev-keiko-sandbox-1.0.3.tgz +0 -0
  171. package/vendor/oscharko-dev-keiko-sdk-1.0.3.tgz +0 -0
  172. package/vendor/oscharko-dev-keiko-tool-catalog-1.0.3.tgz +0 -0
  173. /package/dist/ui/static/_next/static/{1BZa3EoPufXZpDHFm8Sty → IaAMlj5CIiO4E3RPp1TWn}/_buildManifest.js +0 -0
  174. /package/dist/ui/static/_next/static/{1BZa3EoPufXZpDHFm8Sty → IaAMlj5CIiO4E3RPp1TWn}/_clientMiddlewareManifest.js +0 -0
  175. /package/dist/ui/static/_next/static/{1BZa3EoPufXZpDHFm8Sty → IaAMlj5CIiO4E3RPp1TWn}/_ssgManifest.js +0 -0
@@ -1,5 +1,10 @@
1
+ import { homedir as defaultHomedir } from "node:os";
1
2
  import { join } from "node:path";
2
3
  import { pathToFileURL } from "node:url";
4
+ import { emitSecurityLogEvent, securityErrorKind, } from "@oscharko-dev/keiko-security";
5
+ import { cliControlStateConflictsWithTarget, cliTargetIdentitySha256, resolveCliControlStateDir, } from "./cli-control-state.js";
6
+ import { installLayoutOverrideEvidence, writeInstallLayoutOverrideEvidenceWithFactory, } from "./install-layout.js";
7
+ import { createCliSecurityLogSink } from "./security-log.js";
3
8
  // `keiko audit local-state` — the at-rest self-verification the local-at-rest contract
4
9
  // (docs/local-runtime-state-contract.md) names as its compensating control, reachable from a real
5
10
  // packaged install (audit KEIKO-0230).
@@ -213,7 +218,7 @@ function reportLoadFailure(error, io) {
213
218
  }
214
219
  io.err(`keiko audit: local-state audit could not run — ${error.causeConstructorName ?? "Error"}\n`);
215
220
  }
216
- async function runLocalStateAudit(stateDir, auditorPath, io, json, deps) {
221
+ async function runLocalStateAudit(stateDir, auditorPath, io, json, deps, activityLogSink, targetSha256) {
217
222
  let result;
218
223
  try {
219
224
  result = await loadAuditResult(stateDir, auditorPath, deps);
@@ -221,9 +226,27 @@ async function runLocalStateAudit(stateDir, auditorPath, io, json, deps) {
221
226
  catch (error) {
222
227
  if (!(error instanceof AuditLoadError))
223
228
  throw error;
229
+ emitSecurityLogEvent(activityLogSink, {
230
+ level: "error",
231
+ category: "diagnostic",
232
+ op: "cli.audit.failed",
233
+ errorKind: securityErrorKind(error),
234
+ extra: { reason: error.reason, targetSha256 },
235
+ });
224
236
  reportLoadFailure(error, io);
225
237
  return 1;
226
238
  }
239
+ emitSecurityLogEvent(activityLogSink, {
240
+ level: "info",
241
+ category: "diagnostic",
242
+ op: "cli.audit.completed",
243
+ extra: {
244
+ healthy: result.ok,
245
+ classCount: result.classes.length,
246
+ findingCount: result.classes.reduce((count, entry) => count + entry.findings.length, 0),
247
+ targetSha256,
248
+ },
249
+ });
227
250
  if (json) {
228
251
  // Exactly the serialized result plus a newline, nothing else on stdout: a consumer piping
229
252
  // this into `jq` (or `keiko bundle export`'s own manifest assembly, run out of process) must
@@ -239,6 +262,76 @@ async function runLocalStateAudit(stateDir, auditorPath, io, json, deps) {
239
262
  io.err("\nlocal-state: FAIL\n");
240
263
  return 1;
241
264
  }
265
+ function resolveAuditorPath(env, io) {
266
+ const auditorPath = env.KEIKO_LOCAL_STATE_AUDITOR;
267
+ if (auditorPath !== undefined && auditorPath !== "")
268
+ return auditorPath;
269
+ // Fail closed and say why. A silent skip here would read as "audited, nothing wrong" for the
270
+ // one control that is supposed to prove the at-rest claims.
271
+ io.err("keiko audit: the local-state auditor was not located in this installation " +
272
+ "(KEIKO_LOCAL_STATE_AUDITOR is unset). Reinstall the package, or run " +
273
+ "`npm run audit:local-state -- --state-dir <path>` from a repository checkout.\n");
274
+ return undefined;
275
+ }
276
+ function emitAuditPreparationFailure(context, errorKind, reason) {
277
+ const sink = createCliSecurityLogSink(context.activityStateDir, context.factory, context.correlationId);
278
+ emitSecurityLogEvent(sink, {
279
+ level: "error",
280
+ category: "diagnostic",
281
+ op: "cli.audit.failed",
282
+ errorKind,
283
+ extra: { reason, targetSha256: context.targetSha256 },
284
+ });
285
+ }
286
+ function resolveAuditActivityContext(stateDir, env, deps) {
287
+ const home = (deps.homedir ?? defaultHomedir)();
288
+ const platform = deps.platform ?? process.platform;
289
+ const layoutEvidence = installLayoutOverrideEvidence(env);
290
+ return {
291
+ activityStateDir: deps.activityStateDir ?? resolveCliControlStateDir(platform, home),
292
+ targetSha256: cliTargetIdentitySha256(stateDir),
293
+ correlationId: layoutEvidence?.correlationId,
294
+ factory: deps.activityLogSinkFactory,
295
+ };
296
+ }
297
+ function openAuditActivity(context, env, io) {
298
+ const pendingLayoutEvidence = installLayoutOverrideEvidence(env) !== undefined;
299
+ const layoutEvidenceWritten = writeInstallLayoutOverrideEvidenceWithFactory(context.factory, context.activityStateDir, env);
300
+ if (pendingLayoutEvidence && !layoutEvidenceWritten) {
301
+ emitAuditPreparationFailure(context, "AuditActivityLogUnavailableError", "activity-log-unavailable");
302
+ io.err("keiko audit: refusing to consume a normalized install path because durable activity " +
303
+ "logging is unavailable.\n");
304
+ return { kind: "refused" };
305
+ }
306
+ const sink = createCliSecurityLogSink(context.activityStateDir, context.factory, context.correlationId);
307
+ emitSecurityLogEvent(sink, {
308
+ level: "info",
309
+ category: "diagnostic",
310
+ op: "cli.audit.started",
311
+ extra: { targetSha256: context.targetSha256 },
312
+ });
313
+ return { kind: "ready", sink, targetSha256: context.targetSha256 };
314
+ }
315
+ function prepareAuditActivity(stateDir, env, io, deps) {
316
+ const context = resolveAuditActivityContext(stateDir, env, deps);
317
+ let controlStateValidated = false;
318
+ try {
319
+ if (cliControlStateConflictsWithTarget(context.activityStateDir, stateDir)) {
320
+ io.err("keiko audit: refusing to run because the reserved CLI control state overlaps the " +
321
+ "audited tree. Select a different --state-dir.\n");
322
+ return { kind: "refused" };
323
+ }
324
+ controlStateValidated = true;
325
+ return openAuditActivity(context, env, io);
326
+ }
327
+ catch (error) {
328
+ if (controlStateValidated) {
329
+ emitAuditPreparationFailure(context, securityErrorKind(error), "activity-log-open-failed");
330
+ }
331
+ io.err("keiko audit: the reserved CLI control state could not be validated or opened.\n");
332
+ return { kind: "refused" };
333
+ }
334
+ }
242
335
  export async function runAuditCli(rest, io, env, deps = {}) {
243
336
  const parsed = parseAuditArgs(rest);
244
337
  if (parsed.kind === "help") {
@@ -249,15 +342,6 @@ export async function runAuditCli(rest, io, env, deps = {}) {
249
342
  io.err(`${USAGE}\n`);
250
343
  return 2;
251
344
  }
252
- const auditorPath = env.KEIKO_LOCAL_STATE_AUDITOR;
253
- if (auditorPath === undefined || auditorPath === "") {
254
- // Fail closed and say why. A silent skip here would read as "audited, nothing wrong" for the
255
- // one control that is supposed to prove the at-rest claims.
256
- io.err("keiko audit: the local-state auditor was not located in this installation " +
257
- "(KEIKO_LOCAL_STATE_AUDITOR is unset). Reinstall the package, or run " +
258
- "`npm run audit:local-state -- --state-dir <path>` from a repository checkout.\n");
259
- return 1;
260
- }
261
345
  // KEIKO_STATE_DIR is where the product actually keeps its state when the operator moved it, so
262
346
  // defaulting to <cwd>/.keiko while that is set audits a directory the runtime does not use —
263
347
  // and a PASS on the wrong tree is worse than no answer (review finding on #3159). An explicit
@@ -267,5 +351,19 @@ export async function runAuditCli(rest, io, env, deps = {}) {
267
351
  ? configuredStateDir
268
352
  : join(deps.cwd ?? process.cwd(), ".keiko");
269
353
  const stateDir = parsed.stateDir ?? defaultStateDir;
270
- return runLocalStateAudit(stateDir, auditorPath, io, parsed.json, deps);
354
+ const activity = prepareAuditActivity(stateDir, env, io, deps);
355
+ if (activity.kind === "refused")
356
+ return 1;
357
+ const auditorPath = resolveAuditorPath(env, io);
358
+ if (auditorPath === undefined) {
359
+ emitSecurityLogEvent(activity.sink, {
360
+ level: "error",
361
+ category: "diagnostic",
362
+ op: "cli.audit.failed",
363
+ errorKind: "AuditConfigurationError",
364
+ extra: { reason: "auditor-unavailable", targetSha256: activity.targetSha256 },
365
+ });
366
+ return 1;
367
+ }
368
+ return runLocalStateAudit(stateDir, auditorPath, io, parsed.json, deps, activity.sink, activity.targetSha256);
271
369
  }
@@ -0,0 +1,13 @@
1
+ /**
2
+ * Durable CLI activity state that is independent from a workspace's removable runtime state.
3
+ *
4
+ * The path deliberately ignores environment overrides: commands use it while auditing or
5
+ * deleting an operator-selected state tree, so steering it through that tree would defeat the
6
+ * evidence boundary it exists to preserve.
7
+ */
8
+ export declare function resolveCliControlStateDir(platform?: NodeJS.Platform, home?: string): string;
9
+ /** Stable body-free identity for an operator-selected filesystem target. */
10
+ export declare function cliTargetIdentitySha256(targetDir: string): string;
11
+ /** True when either the control state or selected target contains the other. */
12
+ export declare function cliControlStateConflictsWithTarget(controlStateDir: string, targetDir: string): boolean;
13
+ //# sourceMappingURL=cli-control-state.d.ts.map
@@ -0,0 +1 @@
1
+ {"version":3,"file":"cli-control-state.d.ts","sourceRoot":"","sources":["../src/cli-control-state.ts"],"names":[],"mappings":"AAKA;;;;;;GAMG;AACH,wBAAgB,yBAAyB,CACvC,QAAQ,GAAE,MAAM,CAAC,QAA2B,EAC5C,IAAI,GAAE,MAAkB,GACvB,MAAM,CAQR;AAED,4EAA4E;AAC5E,wBAAgB,uBAAuB,CAAC,SAAS,EAAE,MAAM,GAAG,MAAM,CAEjE;AAsBD,gFAAgF;AAChF,wBAAgB,kCAAkC,CAChD,eAAe,EAAE,MAAM,EACvB,SAAS,EAAE,MAAM,GAChB,OAAO,CAIT"}
@@ -0,0 +1,47 @@
1
+ import { createHash } from "node:crypto";
2
+ import { existsSync, realpathSync } from "node:fs";
3
+ import { homedir } from "node:os";
4
+ import { basename, dirname, isAbsolute, join, relative, resolve, sep, win32 } from "node:path";
5
+ /**
6
+ * Durable CLI activity state that is independent from a workspace's removable runtime state.
7
+ *
8
+ * The path deliberately ignores environment overrides: commands use it while auditing or
9
+ * deleting an operator-selected state tree, so steering it through that tree would defeat the
10
+ * evidence boundary it exists to preserve.
11
+ */
12
+ export function resolveCliControlStateDir(platform = process.platform, home = homedir()) {
13
+ if (platform === "win32") {
14
+ return win32.join(home, "AppData", "Local", "Keiko", "control");
15
+ }
16
+ if (platform === "darwin") {
17
+ return join(home, "Library", "Application Support", "Keiko", "control");
18
+ }
19
+ return join(home, ".local", "state", "keiko", "control");
20
+ }
21
+ /** Stable body-free identity for an operator-selected filesystem target. */
22
+ export function cliTargetIdentitySha256(targetDir) {
23
+ return createHash("sha256").update(resolve(targetDir), "utf8").digest("hex");
24
+ }
25
+ function canonicalizeWithMissingTail(path) {
26
+ let cursor = resolve(path);
27
+ const missing = [];
28
+ while (!existsSync(cursor)) {
29
+ const parent = dirname(cursor);
30
+ if (parent === cursor)
31
+ break;
32
+ missing.unshift(basename(cursor));
33
+ cursor = parent;
34
+ }
35
+ return resolve(realpathSync.native(cursor), ...missing);
36
+ }
37
+ function isAtOrBelow(candidate, target) {
38
+ const fromTarget = relative(target, candidate);
39
+ return (fromTarget === "" ||
40
+ (fromTarget !== ".." && !fromTarget.startsWith(`..${sep}`) && !isAbsolute(fromTarget)));
41
+ }
42
+ /** True when either the control state or selected target contains the other. */
43
+ export function cliControlStateConflictsWithTarget(controlStateDir, targetDir) {
44
+ const control = canonicalizeWithMissingTail(controlStateDir);
45
+ const target = canonicalizeWithMissingTail(targetDir);
46
+ return isAtOrBelow(control, target) || isAtOrBelow(target, control);
47
+ }
@@ -19,4 +19,5 @@ export { runTaskWorkspaceCli, type TaskWorkspaceCliDeps } from "./task-workspace
19
19
  export { runUiCli, parseUiArgs, waitForShutdown, type UiCliDeps } from "./ui.js";
20
20
  export { runLauncherCli, type LauncherCliDeps } from "./launcher.js";
21
21
  export { runPortableCli, type PortableSetupDeps } from "./portable.js";
22
+ export { applyAuthoritativeInstallLayout, installLayoutOverrideEvidence, writeInstallLayoutOverrideEvidence, INSTALL_LAYOUT_CORRELATION_ID_ENV, INSTALL_LAYOUT_OVERRIDES_ENV, type AuthoritativeInstallLayout, type InstallLayoutOverrideEvidence, type InstallLayoutOverrideKind, } from "./install-layout.js";
22
23
  //# sourceMappingURL=index.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACpG,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,KAAK,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAChG,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,KAAK,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,KAAK,SAAS,EAAE,MAAM,SAAS,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC"}
1
+ {"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAQA,OAAO,EAAE,MAAM,EAAE,KAAK,KAAK,EAAE,MAAM,aAAa,CAAC;AACjD,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,KAAK,gBAAgB,EAAE,MAAM,qBAAqB,CAAC;AACpG,OAAO,EAAE,WAAW,EAAE,MAAM,UAAU,CAAC;AACvC,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,KAAK,YAAY,EAAE,MAAM,eAAe,CAAC;AAClE,OAAO,EAAE,oBAAoB,EAAE,KAAK,qBAAqB,EAAE,MAAM,sBAAsB,CAAC;AACxF,OAAO,EAAE,cAAc,EAAE,MAAM,eAAe,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,cAAc,CAAC;AAC7C,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,UAAU,EAAE,kBAAkB,EAAE,iBAAiB,EAAE,KAAK,WAAW,EAAE,MAAM,WAAW,CAAC;AAChG,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,MAAM,aAAa,CAAC;AAC/D,OAAO,EAAE,eAAe,EAAE,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,YAAY,EAAE,KAAK,aAAa,EAAE,KAAK,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,KAAK,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AACxE,OAAO,EAAE,mBAAmB,EAAE,KAAK,oBAAoB,EAAE,MAAM,qBAAqB,CAAC;AACrF,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,eAAe,EAAE,KAAK,SAAS,EAAE,MAAM,SAAS,CAAC;AACjF,OAAO,EAAE,cAAc,EAAE,KAAK,eAAe,EAAE,MAAM,eAAe,CAAC;AACrE,OAAO,EAAE,cAAc,EAAE,KAAK,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACvE,OAAO,EACL,+BAA+B,EAC/B,6BAA6B,EAC7B,kCAAkC,EAClC,iCAAiC,EACjC,4BAA4B,EAC5B,KAAK,0BAA0B,EAC/B,KAAK,6BAA6B,EAClC,KAAK,yBAAyB,GAC/B,MAAM,qBAAqB,CAAC"}
@@ -26,5 +26,6 @@ export { runTaskWorkspaceCli } from "./task-workspace.js";
26
26
  export { runUiCli, parseUiArgs, waitForShutdown } from "./ui.js";
27
27
  export { runLauncherCli } from "./launcher.js";
28
28
  export { runPortableCli } from "./portable.js";
29
+ export { applyAuthoritativeInstallLayout, installLayoutOverrideEvidence, writeInstallLayoutOverrideEvidence, INSTALL_LAYOUT_CORRELATION_ID_ENV, INSTALL_LAYOUT_OVERRIDES_ENV, } from "./install-layout.js";
29
30
  // gateway-config.ts is a helper module (resolveConfigPathFromArgs) used internally by
30
31
  // models.ts; it does not expose a CLI command, so nothing is re-exported here.
@@ -1,4 +1,31 @@
1
1
  import type { EnvSource } from "@oscharko-dev/keiko-model-gateway";
2
+ export declare const INSTALL_LAYOUT_OVERRIDES_ENV = "KEIKO_INSTALL_LAYOUT_OVERRIDES";
3
+ export declare const INSTALL_LAYOUT_CORRELATION_ID_ENV = "KEIKO_INSTALL_LAYOUT_CORRELATION_ID";
4
+ declare const INSTALL_LAYOUT_OVERRIDE_KINDS: readonly ["cli-bin", "ui-static-root", "local-state-auditor"];
5
+ export type InstallLayoutOverrideKind = (typeof INSTALL_LAYOUT_OVERRIDE_KINDS)[number];
6
+ export interface AuthoritativeInstallLayout {
7
+ readonly cliBinPath: string;
8
+ readonly uiStaticRoot: string;
9
+ readonly localStateAuditor: string;
10
+ }
11
+ export interface InstallLayoutOverrideEvidence {
12
+ readonly correlationId: string;
13
+ readonly overriddenKinds: readonly InstallLayoutOverrideKind[];
14
+ }
15
+ interface InstallLayoutEvidenceSink {
16
+ readonly write: (event: {
17
+ readonly level: "info";
18
+ readonly category: "diagnostic";
19
+ readonly op: string;
20
+ readonly correlationId: string;
21
+ readonly extra: Readonly<Record<string, unknown>>;
22
+ }) => void;
23
+ }
24
+ type InstallLayoutEvidenceSinkFactory = (stateDir: string) => InstallLayoutEvidenceSink;
25
+ export declare function installLayoutOverrideEvidence(env: EnvSource): InstallLayoutOverrideEvidence | undefined;
26
+ export declare function writeInstallLayoutOverrideEvidence(sink: InstallLayoutEvidenceSink | undefined, env: EnvSource): boolean;
27
+ export declare function writeInstallLayoutOverrideEvidenceWithFactory(factory: InstallLayoutEvidenceSinkFactory | undefined, stateDir: string, env: EnvSource): boolean;
28
+ export declare function applyAuthoritativeInstallLayout(env: NodeJS.ProcessEnv, layout: AuthoritativeInstallLayout): void;
2
29
  export interface PreferredInstallLayout {
3
30
  readonly binPath: string;
4
31
  readonly staticRoot: string;
@@ -16,4 +43,5 @@ export declare function localPackageRoot(cwd: string): string;
16
43
  export declare function resolvePreferredInstallLayout(cwd: string): PreferredInstallLayout | undefined;
17
44
  export declare function resolveKeikoBinary(cwd: string, env?: EnvSource, argv?: readonly string[]): KeikoBinaryResolution | undefined;
18
45
  export declare function absoluteExistingPath(value: unknown): string | undefined;
46
+ export {};
19
47
  //# sourceMappingURL=install-layout.d.ts.map
@@ -1 +1 @@
1
- {"version":3,"file":"install-layout.d.ts","sourceRoot":"","sources":["../src/install-layout.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAInE,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,yBAA0B,SAAQ,sBAAsB;IACvE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG,eAAe,GAAG,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAEnG,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;CACpC;AAiBD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAKzD;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEpD;AAsBD,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS,CAE7F;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,GAAG,GAAE,SAAuB,EAC5B,IAAI,GAAE,SAAS,MAAM,EAAiB,GACrC,qBAAqB,GAAG,SAAS,CA4BnC;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAEvE"}
1
+ {"version":3,"file":"install-layout.d.ts","sourceRoot":"","sources":["../src/install-layout.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAGnE,eAAO,MAAM,4BAA4B,mCAAmC,CAAC;AAC7E,eAAO,MAAM,iCAAiC,wCAAwC,CAAC;AAEvF,QAAA,MAAM,6BAA6B,YAAI,SAAS,EAAE,gBAAgB,EAAE,qBAAqB,CAAU,CAAC;AAGpG,MAAM,MAAM,yBAAyB,GAAG,CAAC,OAAO,6BAA6B,CAAC,CAAC,MAAM,CAAC,CAAC;AAEvF,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;CACpC;AAED,MAAM,WAAW,6BAA6B;IAC5C,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,eAAe,EAAE,SAAS,yBAAyB,EAAE,CAAC;CAChE;AAED,UAAU,yBAAyB;IACjC,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE;QACtB,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QACvB,QAAQ,CAAC,QAAQ,EAAE,YAAY,CAAC;QAChC,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QACpB,QAAQ,CAAC,aAAa,EAAE,MAAM,CAAC;QAC/B,QAAQ,CAAC,KAAK,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;KACnD,KAAK,IAAI,CAAC;CACZ;AAED,KAAK,gCAAgC,GAAG,CAAC,QAAQ,EAAE,MAAM,KAAK,yBAAyB,CAAC;AAoBxF,wBAAgB,6BAA6B,CAC3C,GAAG,EAAE,SAAS,GACb,6BAA6B,GAAG,SAAS,CAY3C;AAED,wBAAgB,kCAAkC,CAChD,IAAI,EAAE,yBAAyB,GAAG,SAAS,EAC3C,GAAG,EAAE,SAAS,GACb,OAAO,CAgBT;AAED,wBAAgB,6CAA6C,CAC3D,OAAO,EAAE,gCAAgC,GAAG,SAAS,EACrD,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,SAAS,GACb,OAAO,CAGT;AAED,wBAAgB,+BAA+B,CAC7C,GAAG,EAAE,MAAM,CAAC,UAAU,EACtB,MAAM,EAAE,0BAA0B,GACjC,IAAI,CAkBN;AAED,MAAM,WAAW,sBAAsB;IACrC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;CAC7B;AAED,MAAM,WAAW,yBAA0B,SAAQ,sBAAsB;IACvE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,MAAM,iBAAiB,GAAG,aAAa,GAAG,eAAe,GAAG,cAAc,GAAG,MAAM,GAAG,MAAM,CAAC;AAEnG,MAAM,WAAW,qBAAqB;IACpC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,iBAAiB,CAAC;CACpC;AAiBD,wBAAgB,mBAAmB,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAKzD;AAED,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAEpD;AAsBD,wBAAgB,6BAA6B,CAAC,GAAG,EAAE,MAAM,GAAG,sBAAsB,GAAG,SAAS,CAE7F;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,MAAM,EACX,GAAG,GAAE,SAAuB,EAC5B,IAAI,GAAE,SAAS,MAAM,EAAiB,GACrC,qBAAqB,GAAG,SAAS,CA4BnC;AAED,wBAAgB,oBAAoB,CAAC,KAAK,EAAE,OAAO,GAAG,MAAM,GAAG,SAAS,CAEvE"}
@@ -1,6 +1,77 @@
1
+ import { randomUUID } from "node:crypto";
1
2
  import { existsSync, readFileSync } from "node:fs";
2
3
  import { isAbsolute, join, resolve } from "node:path";
3
4
  const ROOT_PACKAGE_NAME = "@oscharko-dev/keiko";
5
+ export const INSTALL_LAYOUT_OVERRIDES_ENV = "KEIKO_INSTALL_LAYOUT_OVERRIDES";
6
+ export const INSTALL_LAYOUT_CORRELATION_ID_ENV = "KEIKO_INSTALL_LAYOUT_CORRELATION_ID";
7
+ const INSTALL_LAYOUT_OVERRIDE_KINDS = ["cli-bin", "ui-static-root", "local-state-auditor"];
8
+ const UUID = /^[0-9a-f]{8}-[0-9a-f]{4}-[1-5][0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}$/u;
9
+ function installLayoutEntries(layout) {
10
+ return [
11
+ { envName: "KEIKO_CLI_BIN_PATH", kind: "cli-bin", value: layout.cliBinPath },
12
+ { envName: "KEIKO_UI_STATIC_ROOT", kind: "ui-static-root", value: layout.uiStaticRoot },
13
+ {
14
+ envName: "KEIKO_LOCAL_STATE_AUDITOR",
15
+ kind: "local-state-auditor",
16
+ value: layout.localStateAuditor,
17
+ },
18
+ ];
19
+ }
20
+ export function installLayoutOverrideEvidence(env) {
21
+ const correlationId = env[INSTALL_LAYOUT_CORRELATION_ID_ENV];
22
+ const rawKinds = env[INSTALL_LAYOUT_OVERRIDES_ENV]?.split(",") ?? [];
23
+ if (correlationId === undefined || !UUID.test(correlationId) || rawKinds.length === 0) {
24
+ return undefined;
25
+ }
26
+ const requested = new Set(rawKinds);
27
+ const overriddenKinds = INSTALL_LAYOUT_OVERRIDE_KINDS.filter((kind) => requested.has(kind));
28
+ if (requested.size !== rawKinds.length || overriddenKinds.length !== requested.size) {
29
+ return undefined;
30
+ }
31
+ return { correlationId, overriddenKinds };
32
+ }
33
+ export function writeInstallLayoutOverrideEvidence(sink, env) {
34
+ const evidence = installLayoutOverrideEvidence(env);
35
+ if (sink === undefined || evidence === undefined)
36
+ return false;
37
+ sink.write({
38
+ level: "info",
39
+ category: "diagnostic",
40
+ op: "cli.install-layout.normalized",
41
+ correlationId: evidence.correlationId,
42
+ extra: {
43
+ overriddenCount: evidence.overriddenKinds.length,
44
+ overriddenKinds: evidence.overriddenKinds,
45
+ },
46
+ });
47
+ Reflect.deleteProperty(env, INSTALL_LAYOUT_OVERRIDES_ENV);
48
+ Reflect.deleteProperty(env, INSTALL_LAYOUT_CORRELATION_ID_ENV);
49
+ return true;
50
+ }
51
+ export function writeInstallLayoutOverrideEvidenceWithFactory(factory, stateDir, env) {
52
+ if (factory === undefined || installLayoutOverrideEvidence(env) === undefined)
53
+ return false;
54
+ return writeInstallLayoutOverrideEvidence(factory(stateDir), env);
55
+ }
56
+ export function applyAuthoritativeInstallLayout(env, layout) {
57
+ const entries = installLayoutEntries(layout);
58
+ const inherited = entries.every((entry) => env[entry.envName] === entry.value)
59
+ ? installLayoutOverrideEvidence(env)
60
+ : undefined;
61
+ const overriddenKinds = inherited?.overriddenKinds ??
62
+ entries
63
+ .filter((entry) => env[entry.envName] !== undefined && env[entry.envName] !== entry.value)
64
+ .map((entry) => entry.kind);
65
+ for (const entry of entries)
66
+ env[entry.envName] = entry.value;
67
+ if (overriddenKinds.length === 0) {
68
+ Reflect.deleteProperty(env, INSTALL_LAYOUT_OVERRIDES_ENV);
69
+ Reflect.deleteProperty(env, INSTALL_LAYOUT_CORRELATION_ID_ENV);
70
+ return;
71
+ }
72
+ env[INSTALL_LAYOUT_OVERRIDES_ENV] = overriddenKinds.join(",");
73
+ env[INSTALL_LAYOUT_CORRELATION_ID_ENV] = inherited?.correlationId ?? randomUUID();
74
+ }
4
75
  function readRootPackageName(cwd) {
5
76
  const packageJsonPath = join(cwd, "package.json");
6
77
  if (!existsSync(packageJsonPath))
@@ -1 +1 @@
1
- {"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AA2CA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAEnE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAsBzC,OAAO,EAGL,KAAK,yBAAyB,EAC/B,MAAM,mBAAmB,CAAC;AAiB3B,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC;IAG1C,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,MAAM,CAAC;IAGjD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,SAAS,KAAK,MAAM,CAAC,GAAG,SAAS,CAAC;IAC7E,QAAQ,CAAC,sBAAsB,CAAC,EAAE,yBAAyB,GAAG,SAAS,CAAC;CACzE;AAgXD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAQD,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,KAAK,EACT,IAAI,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE,GACtF,oBAAoB,CAwBtB;AAuFD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,KAAK,EACT,GAAG,EAAE,SAAS,EACd,IAAI,GAAE,eAAoB,GACzB,MAAM,CAwCR"}
1
+ {"version":3,"file":"launcher.d.ts","sourceRoot":"","sources":["../src/launcher.ts"],"names":[],"mappings":"AA2CA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAEnE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAyBzC,OAAO,EAGL,KAAK,yBAAyB,EAC/B,MAAM,mBAAmB,CAAC;AAiB3B,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,MAAM,CAAC;IAChC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,MAAM,CAAC,QAAQ,CAAC;IAG1C,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,GAAG,EAAE,SAAS,KAAK,MAAM,CAAC;IAGjD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC;IAC3B,QAAQ,CAAC,wBAAwB,CAAC,EAAE,CAAC,CAAC,GAAG,EAAE,SAAS,KAAK,MAAM,CAAC,GAAG,SAAS,CAAC;IAC7E,QAAQ,CAAC,sBAAsB,CAAC,EAAE,yBAAyB,GAAG,SAAS,CAAC;CACzE;AAgXD,MAAM,WAAW,oBAAoB;IACnC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;CAC1B;AAQD,wBAAgB,uBAAuB,CACrC,EAAE,EAAE,KAAK,EACT,IAAI,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE,GACtF,oBAAoB,CAwBtB;AAuFD,wBAAgB,cAAc,CAC5B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,KAAK,EACT,GAAG,EAAE,SAAS,EACd,IAAI,GAAE,eAAoB,GACzB,MAAM,CAyCR"}
@@ -33,7 +33,7 @@ import { resolveWindowsPowerShellExecutable } from "@oscharko-dev/keiko-security
33
33
  import { LauncherError, launcherFor, validateExecPath, validatePort, windowsLauncherNeedsPowerShell, } from "./launcher-platforms.js";
34
34
  import { assertRealpathContained } from "./launcher-paths.js";
35
35
  import { hashContent, loadState, removeEntry, saveState, upsertEntry, } from "./launcher-state.js";
36
- import { resolveKeikoBinary } from "./install-layout.js";
36
+ import { resolveKeikoBinary, writeInstallLayoutOverrideEvidenceWithFactory, } from "./install-layout.js";
37
37
  import { resolveContainedStateDir } from "./state-paths.js";
38
38
  import { createCliSecurityLogSink, emitCliWindowsSystemFailure, } from "./security-log.js";
39
39
  const USAGE = `Usage:
@@ -438,6 +438,7 @@ export function runLauncherCli(args, io, env, deps = {}) {
438
438
  // is converted to a `1` exit instead of an uncaught throw.
439
439
  const r = resolveDeps(env, deps);
440
440
  resolved = r;
441
+ writeInstallLayoutOverrideEvidenceWithFactory(deps.securityLogSinkFactory, r.stateDir, env);
441
442
  const home = r.homedir();
442
443
  const handlers = {
443
444
  install: () => dispatchInstall(rest, io, env, r),
@@ -1 +1 @@
1
- {"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../src/lifecycle.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"lifecycle.d.ts","sourceRoot":"","sources":["../src/lifecycle.ts"],"names":[],"mappings":"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"}
@@ -15,7 +15,7 @@ import { resolveWindowsPowerShellExecutable, } from "@oscharko-dev/keiko-securit
15
15
  // dynamic inside the `--open` path.
16
16
  import { CODING_APP_SESSION_LAUNCHER_SECRET_ENV, CODING_APP_SESSION_LAUNCHER_SECRET_MIN_CHARS, encodeCodingAppSessionPairingFragment, } from "@oscharko-dev/keiko-contracts/runtime/coding-app-session";
17
17
  import { KEIKO_PRODUCT_VERSION as SDK_VERSION } from "@oscharko-dev/keiko-contracts/runtime/version";
18
- import { absoluteExistingPath, resolvePreferredInstallLayout } from "./install-layout.js";
18
+ import { absoluteExistingPath, resolvePreferredInstallLayout, writeInstallLayoutOverrideEvidence, } from "./install-layout.js";
19
19
  import { LauncherError } from "./launcher-platforms.js";
20
20
  import { resolveLoopbackEndpoint } from "./loopback-endpoint.js";
21
21
  import { createCliSecurityLogSink, emitCliWindowsSystemFailure, } from "./security-log.js";
@@ -754,6 +754,7 @@ export async function runLifecycleCli(command, args, io, env, deps = {}) {
754
754
  return 1;
755
755
  }
756
756
  const options = outcome.value;
757
+ writeInstallLayoutOverrideEvidence(deps.securityLogSinkFactory?.(options.stateDir), env);
757
758
  const securityLogSink = deps.securityLogSink ?? createCliSecurityLogSink(options.stateDir, deps.securityLogSinkFactory);
758
759
  const fullDeps = runtimeDeps(deps, env, securityLogSink);
759
760
  const handlers = {
@@ -1 +1 @@
1
- {"version":3,"file":"portable.d.ts","sourceRoot":"","sources":["../src/portable.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"portable.d.ts","sourceRoot":"","sources":["../src/portable.ts"],"names":[],"mappings":"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"}
@@ -3,6 +3,7 @@ import { existsSync } from "node:fs";
3
3
  import { arch as hostArch, homedir as defaultHomedir } from "node:os";
4
4
  import { isAbsolute, join, resolve } from "node:path";
5
5
  import { loadServer } from "./lazy-modules.js";
6
+ import { installLayoutOverrideEvidence, writeInstallLayoutOverrideEvidenceWithFactory, } from "./install-layout.js";
6
7
  import { runLifecycleCli } from "./lifecycle.js";
7
8
  import { activateMacosPortableRuntime, } from "./portable-macos-activation.js";
8
9
  import { notifyPortableLaunchFailure, } from "./portable-launch-notifier.js";
@@ -11,6 +12,7 @@ import { defaultManagedRoot, isPortableCommand, isPortableTarget, targetForHost,
11
12
  import { hasPortableInstallRegistration } from "./portable-registration.js";
12
13
  import { assertManagedRootAllowed } from "./portable-root-policy.js";
13
14
  import { createCliSecurityLogSink } from "./security-log.js";
15
+ import { inspectStateRoot } from "./state-paths.js";
14
16
  const USAGE = `Usage:
15
17
  keiko portable setup [--target TARGET] [--portable-root PATH] [--managed-root PATH] [--state-dir PATH] [--dry-run]
16
18
  keiko portable launch [--target TARGET] [--portable-root PATH] [--managed-root PATH] [--state-dir PATH]
@@ -372,6 +374,14 @@ function notifyPortableFailureIfNeeded(code, message, env, io, deps, securityLog
372
374
  });
373
375
  notify(message, env);
374
376
  }
377
+ function writePortableInstallLayoutEvidence(options, env, factory) {
378
+ if (installLayoutOverrideEvidence(env) === undefined)
379
+ return;
380
+ const stateRoot = inspectStateRoot(options.stateDir);
381
+ if (stateRoot.status !== "absent" && stateRoot.status !== "directory")
382
+ return;
383
+ writeInstallLayoutOverrideEvidenceWithFactory(factory, options.stateDir, env);
384
+ }
375
385
  export async function runPortableCli(args, io, env, deps = {}) {
376
386
  const r = resolvedDeps(deps);
377
387
  const options = parsePortableArgs(args, env, r);
@@ -385,6 +395,7 @@ export async function runPortableCli(args, io, env, deps = {}) {
385
395
  }
386
396
  if (options.command === "status")
387
397
  return statusPortable(options, io);
398
+ writePortableInstallLayoutEvidence(options, env, deps.securityLogSinkFactory);
388
399
  const commandOptions = {
389
400
  ...options,
390
401
  securityLogSink: createCliSecurityLogSink(options.stateDir, deps.securityLogSinkFactory),
@@ -1 +1 @@
1
- {"version":3,"file":"repair.d.ts","sourceRoot":"","sources":["../src/repair.ts"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AA6CzC,OAAO,EAA4B,KAAK,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAmD7F,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,MAAM,CAAC;IAChC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACnD,QAAQ,CAAC,sBAAsB,CAAC,EAAE,yBAAyB,GAAG,SAAS,CAAC;CACzE;AAy1BD,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,KAAK,EACT,GAAG,EAAE,SAAS,EACd,IAAI,GAAE,aAAkB,GACvB,MAAM,CAgCR"}
1
+ {"version":3,"file":"repair.d.ts","sourceRoot":"","sources":["../src/repair.ts"],"names":[],"mappings":"AAuCA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AACnE,OAAO,KAAK,EAAE,KAAK,EAAE,MAAM,aAAa,CAAC;AAgDzC,OAAO,EAA4B,KAAK,yBAAyB,EAAE,MAAM,mBAAmB,CAAC;AAmD7F,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAClC,QAAQ,CAAC,IAAI,CAAC,EAAE,SAAS,MAAM,EAAE,GAAG,SAAS,CAAC;IAC9C,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,MAAM,CAAC;IAChC,QAAQ,CAAC,cAAc,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,KAAK,OAAO,CAAC;IACnD,QAAQ,CAAC,sBAAsB,CAAC,EAAE,yBAAyB,GAAG,SAAS,CAAC;CACzE;AA+1BD,wBAAgB,YAAY,CAC1B,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,KAAK,EACT,GAAG,EAAE,SAAS,EACd,IAAI,GAAE,aAAkB,GACvB,MAAM,CAgCR"}
@@ -19,7 +19,7 @@ import { homedir as defaultHomedir } from "node:os";
19
19
  import { dirname, isAbsolute, join } from "node:path";
20
20
  import { ATLASSIAN_CONNECTOR_SCHEMA_VERSION, isAtlassianConnectorAuthRef, isAtlassianConnectorProvider, isSafeAtlassianConnectorBaseUrl, isSafeAtlassianDisplayName, } from "@oscharko-dev/keiko-contracts/runtime/atlassian-connectors";
21
21
  import { collectDoctorReport } from "./doctor.js";
22
- import { resolvePreferredInstallLayout } from "./install-layout.js";
22
+ import { resolvePreferredInstallLayout, writeInstallLayoutOverrideEvidenceWithFactory, } from "./install-layout.js";
23
23
  import { resolveConfigPathFromArgs } from "./gateway-config.js";
24
24
  import { hashContent, loadState, removeEntry, saveState, } from "./launcher-state.js";
25
25
  import { attestedPortableInstallRecord } from "./portable-install.js";
@@ -700,10 +700,15 @@ function exitCodeFor(results, dryRun) {
700
700
  // the 50-line max-lines-per-function bar.
701
701
  function collectRepairResults(args, io, env, parsed, resolved) {
702
702
  const stateDir = resolveStateDir(resolved.cwd, env, parsed.stateDirArg);
703
- const securityLogSink = createCliSecurityLogSink(stateDir, resolved.securityLogSinkFactory);
704
703
  const defaultConfigCandidates = defaultLocalGatewayConfigCandidates(env, resolved.homedir(), stateDir);
705
704
  const stateRoot = inspectStateRoot(stateDir);
706
705
  const stateRootAction = stateRootRefusal(stateRoot);
706
+ if (stateRootAction === undefined) {
707
+ writeInstallLayoutOverrideEvidenceWithFactory(resolved.securityLogSinkFactory, stateDir, env);
708
+ }
709
+ const securityLogSink = stateRootAction === undefined
710
+ ? createCliSecurityLogSink(stateDir, resolved.securityLogSinkFactory)
711
+ : undefined;
707
712
  const stateResults = stateRootAction === undefined
708
713
  ? [
709
714
  checkStalePid(stateDir, resolved.isProcessAlive, parsed.dryRun),
@@ -1 +1 @@
1
- {"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AA6BA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAUnE,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACtC;AAkRD,wBAAgB,MAAM,CACpB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,KAAK,EACT,GAAG,GAAE,SAAc,GAClB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkB1B"}
1
+ {"version":3,"file":"runner.d.ts","sourceRoot":"","sources":["../src/runner.ts"],"names":[],"mappings":"AA8BA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,mCAAmC,CAAC;AAUnE,MAAM,WAAW,KAAK;IACpB,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;IACrC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,IAAI,CAAC;CACtC;AAwWD,wBAAgB,MAAM,CACpB,IAAI,EAAE,SAAS,MAAM,EAAE,EACvB,EAAE,EAAE,KAAK,EACT,GAAG,GAAE,SAAc,GAClB,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAkB1B"}