@boxxy/model 0.1.6 → 0.1.8

package/dist/index.d.ts

@@ -45,7 +45,7 @@ export { relationRowSchema } from './rows/relation-row-schema.ts';
 export { reviewCloseOutSchema } from './closeouts/review-close-out-schema.ts';
 export { rowSchemas } from './rows/row-schemas.ts';
 export { signalKey } from './planning/signal-key.ts';
-export { spawnRequestSchema } from './rows/spawn-request-schema.ts';
+export { gitSourceSchema, spawnRequestSchema } from './rows/spawn-request-schema.ts';
 export { stageTimeSchema } from './reports/stage-time-schema.ts';
 export { toJSONValue } from './utils/to-json-value.ts';
 export { triageCloseOutSchema } from './closeouts/triage-close-out-schema.ts';
@@ -58,7 +58,7 @@ export type { AcceptanceInput, BuildCloseOut, BuildInput, CloseOut, CloseOutAnsw
 export type { Claim } from './dispatch/types.ts';
 export type { AnyNewFact, EntityRef, FactEnvelope, FactType, NewFact, OutboxFact, RelationPayload, WorkFacts, } from './facts/types.ts';
 export type { Admission, AdmissionGrant, AdmissionName, Decision, Fault, Filter, Frame, FrameItem, FrameValues, Gate, GateName, Hold, Lift, Limit, LimitFill, Pick, PlanContext, Pool, PropagationLine, SeatRef, SeatRelease, SeatTake, Signal, SignalKey, SignalName, Snapshot, StartPick, View, ViewName, Wait, WaitReason, Waiver, WaiverName, Wake, WakePick, } from './planning/types.ts';
-export type { ApplyResult, Attention, CallerProof, CapacityBackoff, ClaimStore, Clock, FactSink, ForgetOutcome, Forge, HoldNotice, ItemDetailRows, ItemFilter, NewId, NoticeOutcome, Notifier, OutboxReader, PepysAnswer, PepysReader, SinkAnswer, PullRequestReading, RowWrite, SessionFault, SessionReading, SpawnRequest, StartOutcome, StopOutcome, StoreChange, StoreReader, StoreTx, SuspendOutcome, TableName, Tables, WakeSource, WorkerKind, } from './ports/types.ts';
+export type { ApplyResult, Attention, CallerProof, CapacityBackoff, ClaimStore, Clock, FactSink, ForgetOutcome, Forge, GitSource, HoldNotice, ItemDetailRows, ItemFilter, NewId, NoticeOutcome, Notifier, OutboxReader, PepysAnswer, PepysReader, SinkAnswer, PullRequestReading, RowWrite, SessionFault, SessionReading, SpawnRequest, StartOutcome, StopOutcome, StoreChange, StoreReader, StoreTx, SuspendOutcome, TableName, Tables, WakeSource, WorkerKind, } from './ports/types.ts';
 export type { CostToLand, StageTime } from './reports/types.ts';
 export type { OutboxStatus } from './reports/outbox-status.ts';
 export type { ItemSetRows, ItemWithLevers } from './items/types.ts';

package/dist/ports/types.d.ts

@@ -201,9 +201,17 @@ export type SessionReading = {
     readonly kind: 'absent';
 };
 export type Attention = 'working' | 'needs-input' | 'turn-ended';
-export interface SpawnRequest {
-    readonly target: string;
+export interface GitSource {
+    readonly url: string;
+    readonly ref: string;
+}
+export type SpawnRequest = SpawnRequestFields & ({
     readonly cwd: string;
+} | {
+    readonly source: GitSource;
+});
+interface SpawnRequestFields {
+    readonly target: string;
     readonly prompt: string;
     readonly agent: string;
     readonly model: string;
@@ -287,3 +295,4 @@ export interface Clock {
     now: () => Instant;
 }
 export type NewId = () => string;
+export {};

package/dist/rows/spawn-request-schema.d.ts

@@ -1,3 +1,4 @@
 import { z } from 'zod';
-import type { SpawnRequest } from '../ports/types.ts';
+import type { GitSource, SpawnRequest } from '../ports/types.ts';
+export declare const gitSourceSchema: z.ZodType<GitSource>;
 export declare const spawnRequestSchema: z.ZodType<SpawnRequest>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@boxxy/model",
-  "version": "0.1.6",
+  "version": "0.1.8",
   "description": "The types that boxxy's packages share",
   "homepage": "https://github.com/zgeoff/boxxy/tree/main/libs/model#readme",
   "bugs": "https://github.com/zgeoff/boxxy/issues",
@@ -31,7 +31,7 @@
     "typecheck": "tsrs --noEmit"
   },
   "dependencies": {
-    "@boxxy/content-hash": "0.1.6",
+    "@boxxy/content-hash": "0.1.8",
     "tiny-invariant": "1.3.3",
     "zod": "4.6.7"
   },

package/src/index.ts

@@ -45,7 +45,7 @@ export { relationRowSchema } from './rows/relation-row-schema.ts';
 export { reviewCloseOutSchema } from './closeouts/review-close-out-schema.ts';
 export { rowSchemas } from './rows/row-schemas.ts';
 export { signalKey } from './planning/signal-key.ts';
-export { spawnRequestSchema } from './rows/spawn-request-schema.ts';
+export { gitSourceSchema, spawnRequestSchema } from './rows/spawn-request-schema.ts';
 export { stageTimeSchema } from './reports/stage-time-schema.ts';
 export { toJSONValue } from './utils/to-json-value.ts';
 export { triageCloseOutSchema } from './closeouts/triage-close-out-schema.ts';
@@ -223,6 +223,7 @@ export type {
   FactSink,
   ForgetOutcome,
   Forge,
+  GitSource,
   HoldNotice,
   ItemDetailRows,
   ItemFilter,

package/src/ports/types.ts

@@ -305,12 +305,21 @@ export type SessionReading =
 
 export type Attention = 'working' | 'needs-input' | 'turn-ended';
 
-export interface SpawnRequest {
+// A git repository that atc clones on the target. It carries no credential: an imp clones over its
+// own network, where the broker adds the credential from the session's grants.
+export interface GitSource {
+  readonly url: string;
+  readonly ref: string;
+}
+
+// Exactly one of the two: `cwd`, the repo's folder on a target on the atc daemon's own host, or
+// `source`, which atc clones into a folder it picks on the target.
+export type SpawnRequest = SpawnRequestFields &
+  ({ readonly cwd: string } | { readonly source: GitSource });
+
+interface SpawnRequestFields {
   // the worker target, such as a host name of the worker kind
   readonly target: string;
-
-  // the repo's configured path on the target
-  readonly cwd: string;
   readonly prompt: string;
   readonly agent: string;
   readonly model: string;

package/src/rows/spawn-request-schema.ts

@@ -1,11 +1,23 @@
 import { z } from 'zod';
-import type { SpawnRequest } from '../ports/types.ts';
+import type { GitSource, SpawnRequest } from '../ports/types.ts';
 import { brandSchemas } from './brand-schemas.ts';
 
-// The spawn request as the attempt row stores it, read back for a respawn.
-export const spawnRequestSchema: z.ZodType<SpawnRequest> = z.object({
+// git must never read the URL or the ref as an option, and atc refuses a URL with a credential
+export const gitSourceSchema: z.ZodType<GitSource> = z.strictObject({
+  url: z
+    .url()
+    .max(2048)
+    .refine((url) => !url.startsWith('-'), 'a git source url must not start with -')
+    .refine((url) => isURLWithoutCredential(url), 'a git source url must carry no credential'),
+  ref: z
+    .string()
+    .min(1)
+    .max(255)
+    .refine((ref) => !ref.startsWith('-'), 'a git source ref must not start with -'),
+});
+
+const spawnRequestFields = z.strictObject({
   target: z.string().min(1),
-  cwd: z.string().min(1),
   prompt: z.string(),
   agent: z.string().min(1),
   model: z.string().min(1),
@@ -13,3 +25,29 @@ export const spawnRequestSchema: z.ZodType<SpawnRequest> = z.object({
   name: z.templateLiteral(['boxxy/', z.string()]),
   idempotencyKey: brandSchemas.attemptId,
 });
+
+// The spawn request as the attempt row stores it, read back for a respawn. A request with both a
+// folder and a source, or with neither, fails the parse.
+export const spawnRequestSchema: z.ZodType<SpawnRequest> = spawnRequestFields
+  .extend({ cwd: z.string().min(1).optional(), source: gitSourceSchema.optional() })
+  .transform((request, ctx): SpawnRequest => {
+    const { cwd, source, ...fields } = request;
+
+    if (cwd !== undefined && source === undefined) {
+      return { ...fields, cwd };
+    }
+
+    if (source !== undefined && cwd === undefined) {
+      return { ...fields, source };
+    }
+
+    ctx.addIssue({ code: 'custom', message: 'a spawn request takes a cwd or a source, not both' });
+
+    return z.NEVER;
+  });
+
+function isURLWithoutCredential(url: string): boolean {
+  const parsed = URL.parse(url);
+
+  return parsed !== null && parsed.username === '' && parsed.password === '';
+}