@jigging/jig 0.1.0-alpha.22 → 0.1.0-alpha.24

package/README.md

@@ -44,7 +44,7 @@ jig new <name>
 jig review [project] [--generate-contracts] [--allow-resolution-network] [--allow-authority-changes] [--yes] [--details]
 jig run [flow:path|npm:package|binding:id] [options]
 jig inspect [flow:path|npm:package|binding:id] [--json]
-jig import-contract <source> <destination>
+jig import-contract <descriptor.json|npm:package> <destination>
 jig completion <bash|zsh|fish>
 ```
 
@@ -69,6 +69,17 @@ network socket. See [delegated HTTP access](https://jig.md/guide/http).
 managed JSON and types before the separate execution-approval question. Plain
 review does not compile; already-generated contracts need no compiler runtime.
 
+Declare a project starting point using familiar Run arguments in `jig.ts`:
+
+```ts
+entrypoint: "binding:factory --input @batch.json --attach source=fixtures --out factory-result --timeout 8m",
+```
+
+After review, `jig run` uses that entrypoint. Explicit options override defaults;
+an explicit target bypasses them. Declaration paths are project-relative and job
+files are captured when invoked. Existing output destinations are never replaced.
+A target-only string is valid too. See [project entrypoints](https://jig.md/guide/configuration#project-entrypoint).
+
 `inspect` lists approved targets or shows a target's retained interface without
 evaluating source, contacting providers, preparing dependencies or changing state.
 It checks that approval against current local execution identities and reports

package/THIRD_PARTY_NOTICES

@@ -84,7 +84,11 @@ Jig patches the pinned adapter to disable automatic model-based session titles.
 Requested turns keep their reviewed model and count; deterministic fallback
 titles remain. The patch also propagates native process failure and clears the
 shutdown timer after native close. Forced termination cannot report a clean
-adapter exit. See `packages/jig/patches/codex-acp@1.8.0.patch` and its companion
+adapter exit. It also registers pending turns before asynchronous prompt setup
+so immediate cancellation waits for and interrupts the correct native turn.
+The adapter waits for the matching native turn-start notification before
+exposing the turn as interruptible; a start reply alone does not establish it.
+See `packages/jig/patches/codex-acp@1.8.0.patch` and its companion
 note for the correction and removal condition.
 
 Copyright 2025 JetBrains s.r.o.

package/dist/index.js

@@ -1997,7 +1997,7 @@ function defineJig(input) {
 }
 function normalizeJig(input, canonical) {
   const captured = snapshotJsonObject(input, "Jig definition");
-  assertClosedObject(captured, ["flows", "bindings", "grants", "defaultProviders"], "Jig definition");
+  assertClosedObject(captured, ["flows", "bindings", "grants", "defaultProviders", "entrypoint"], "Jig definition");
   const output = {};
   if (Object.hasOwn(captured, "flows")) {
     output.flows = normalizeSource(captured.flows, "flows", canonical);
@@ -2011,6 +2011,11 @@ function normalizeJig(input, canonical) {
   if (Object.hasOwn(captured, "defaultProviders")) {
     output.defaultProviders = normalizeDefaultProviders(captured.defaultProviders);
   }
+  if (Object.hasOwn(captured, "entrypoint")) {
+    if (typeof captured.entrypoint !== "string" || captured.entrypoint.trim().length === 0 || captured.entrypoint.length > 16384)
+      throw new TypeError("entrypoint must be a nonempty string of at most 16384 characters");
+    output.entrypoint = captured.entrypoint;
+  }
   return record(output);
 }
 function normalizeDefaultProviders(value) {

package/dist/project/author.d.ts

@@ -15,12 +15,14 @@ export interface JigDefinition {
     readonly bindings?: ProjectSource;
     readonly grants?: ProjectSource;
     readonly defaultProviders?: Readonly<Record<string, string>>;
+    readonly entrypoint?: string;
 }
 export interface JigDefinitionInput {
     readonly flows?: ProjectSourceInput;
     readonly bindings?: ProjectSourceInput;
     readonly grants?: ProjectSourceInput;
     readonly defaultProviders?: Readonly<Record<string, string>>;
+    readonly entrypoint?: string;
 }
 export interface FlowRef {
     readonly kind: 'flow';

package/libexec/agent/codex-acp.js

@@ -29076,7 +29076,7 @@ var CodexAppServerClient = class {
       if (this.handleStaleTurnNotification(serverNotification, routing)) {
         return;
       }
-      this.recordTurnRouting(routing);
+      this.recordTurnRouting(routing, serverNotification.method);
       if (this.handleStaleTurnNotification(serverNotification, routing)) {
         return;
       }
@@ -29155,19 +29155,33 @@ var CodexAppServerClient = class {
   }
   async runTurn(params, onTurnStarted) {
     const capturedCompletions = [];
+    const startedTurns = new Set();
+    let expectedTurnId = null;
+    let resolveReady = () => {};
+    const ready = new Promise((resolve) => { resolveReady = resolve; });
+    const releaseRouting = this.captureTurnRoutings(params.threadId, (turnId, method) => {
+      if (method !== "turn/started") return;
+      startedTurns.add(turnId);
+      if (turnId === expectedTurnId) resolveReady();
+    });
     const releaseCapture = this.captureTurnCompletions(params.threadId, (event) => {
       capturedCompletions.push(event);
+      if (event.turn.id === expectedTurnId) resolveReady();
     });
     try {
       const turnStarted = await this.turnStart(params);
-      onTurnStarted?.(turnStarted.turn.id);
-      const earlyCompletion = capturedCompletions.find((event) => event.turn.id === turnStarted.turn.id);
+      expectedTurnId = turnStarted.turn.id;
+      // A turn/start reply allocates an ID before the native turn is interruptible.
+      if (!startedTurns.has(expectedTurnId) && !capturedCompletions.some((event) => event.turn.id === expectedTurnId)) {
+        await ready;
+      }
+      const earlyCompletion = capturedCompletions.find((event) => event.turn.id === expectedTurnId);
+      if (earlyCompletion) return earlyCompletion;
+      onTurnStarted?.(expectedTurnId);
       releaseCapture();
-      if (earlyCompletion) {
-        return earlyCompletion;
-      }
-      return await this.awaitTurnCompleted(params.threadId, turnStarted.turn.id);
+      return await this.awaitTurnCompleted(params.threadId, expectedTurnId);
     } finally {
+      releaseRouting();
       releaseCapture();
     }
   }
@@ -29601,7 +29615,7 @@ var CodexAppServerClient = class {
       capture();
     }
   }
-  recordTurnRouting(routing) {
+  recordTurnRouting(routing, method) {
     if (routing.threadId === null || routing.turnId === null) {
       return;
     }
@@ -29610,7 +29624,7 @@ var CodexAppServerClient = class {
       return;
     }
     for (const capture of captures) {
-      capture(routing.turnId);
+      capture(routing.turnId, method);
     }
   }
   handleStaleTurnNotification(notification, routing) {
@@ -33453,6 +33467,7 @@ Check ${configPath} and project .codex directories, especially their config.toml
       }
       return pendingTurnStart;
     };
+    ensurePendingTurnStart();
     const disposePromptRequestCancellation = this.observePromptRequestCancellation(signal, sessionState, activePrompt);
     let eventHandler = null;
     let promptNotificationsActive = true;

package/libexec/authoring/contract-authoring-worker.js

@@ -20,7 +20,7 @@ async function execute() {
     try {
         if (Number(process.versions.node.split('.')[0]) < 22)
             throw new Error('Node 22 required');
-        const { source, channelContracts } = JSON.parse(input);
+        const { source } = JSON.parse(input);
         let types = true;
         if (source.startsWith('// flow-authoring: ')) {
             const header = JSON.parse(source.split('\n', 1)[0].slice(19));
@@ -30,7 +30,6 @@ async function execute() {
         }
         const result = await compileContract(await stampSource(source, { types }), {
             signal: stop.signal,
-            ...(channelContracts === undefined ? {} : { channelContracts }),
         });
         process.stdout.write(JSON.stringify({ source: result.source, artifacts: result.artifacts }) + '\n', () => process.exit(0));
     }

package/libexec/authoring/node_modules/@jigging/flow-authoring/README.md

@@ -33,13 +33,12 @@ options, not a function to call silently when opening an unfamiliar package.
 It returns new source text; the application chooses whether to retain it.
 `compileContract` requires that pin and refuses a different installed toolchain.
 
-For borrowed agreements, pass their available package-relative names as
-`compileContract(source, { channelContracts: ['./contracts/events.json'] })`.
-The compiler reads no such files and emits only authored outputs. The caller
-must validate and distribute the referenced JSON bytes with the descriptor;
-Jig's managed workflow does this and tracks borrowed-input freshness separately
-from generated-file ownership. The inventory is bounded to 4096 distinct paths
-and 128 KiB; the native contract's smaller closure limits still apply.
+For borrowed agreements, name a package-relative path in the authored channel
+port. The compiler emits that reference without reading or inventorying package
+files. The caller must validate and distribute the referenced JSON bytes with
+the descriptor; Jig's managed workflow resolves only exact references and
+tracks borrowed-input freshness separately from generated-file ownership.
+Native contract closure limits still apply.
 
 A minimal authored body is:
 

package/libexec/authoring/node_modules/@jigging/flow-authoring/dist/index.d.ts

@@ -12,5 +12,4 @@ export interface Compilation {
 export declare function compileContract(source: string, options?: {
     signal?: AbortSignal;
     timeoutMs?: number;
-    channelContracts?: readonly string[];
 }): Promise<Compilation>;

package/libexec/authoring/node_modules/@jigging/flow-authoring/dist/index.js

@@ -1,7 +1,6 @@
 import { Worker } from 'node:worker_threads';
 import { AuthoringError, fail } from './errors.js';
 import { getToolchain, readHeader } from './toolchain.js';
-import { channelReference } from './values.js';
 export { AuthoringError } from './errors.js';
 export { getToolchain, stampSource } from './toolchain.js';
 /** Compile explicit source into a bounded artifact packet, with no publication. */
@@ -15,18 +14,11 @@ export async function compileContract(source, options = {}) {
     if (options.signal?.aborted)
         fail('CANCELLED', 'Compilation was cancelled before it started.');
     const header = readHeader(source, await getToolchain());
-    const channelContracts = options.channelContracts ?? [];
-    if (!Array.isArray(channelContracts) ||
-        channelContracts.length > 4096 ||
-        channelContracts.some((path) => !channelReference(path)) ||
-        Buffer.byteLength(JSON.stringify(channelContracts)) > 131072 ||
-        new Set(channelContracts).size !== channelContracts.length)
-        fail('SOURCE_INVALID', 'Supply at most 4096 distinct package-local channel contract paths within 128 KiB.');
     if (options.signal?.aborted)
         fail('CANCELLED', 'Compilation was cancelled before it started.');
     return new Promise((resolve, reject) => {
         const worker = new Worker(new URL('./worker.js', import.meta.url), {
-            workerData: { source, types: header.types, channelContracts: [...channelContracts] },
+            workerData: { source, types: header.types },
             env: {},
             execArgv: [],
             stdout: true,

package/libexec/authoring/node_modules/@jigging/flow-authoring/dist/lower.d.ts

@@ -48,7 +48,7 @@ interface ChannelDescriptor {
 }
 export declare const schemaId = "https://flow.jig.md/schemas/schema-0.json";
 export declare const contractId = "https://flow.jig.md/schemas/invocation-contract-0.schema.json";
-export declare function lower(program: Program, channelContracts?: ReadonlySet<string>): {
+export declare function lower(program: Program): {
     descriptor: Descriptor;
     projections: Record<string, {
         $schema: string;

package/libexec/authoring/node_modules/@jigging/flow-authoring/dist/lower.js

@@ -25,7 +25,7 @@ function number(value, target) {
     }
     return n === 0 ? 0 : n;
 }
-export function lower(program, channelContracts = new Set()) {
+export function lower(program) {
     const entries = [...program.stateMap(invocationKey)];
     if (entries.length !== 1)
         fail('SOURCE_INVALID', 'Declare exactly one @invocation on a namespace.');
@@ -258,10 +258,6 @@ export function lower(program, channelContracts = new Set()) {
             $defs: reachableDefinitions(emit(type), definitions),
         };
     }
-    for (const port of Object.values(ports)) {
-        if (!Object.hasOwn(channels, port.contract.slice(2)) && !channelContracts.has(port.contract))
-            fail('SOURCE_INVALID', 'Every port must reference a generated channel or a supplied offline contract.', owner, port.contract);
-    }
     const projections = Object.create(null);
     for (const [type, path] of program.stateMap(projectionKey)) {
         if (!authored(type) ||

package/libexec/authoring/node_modules/@jigging/flow-authoring/dist/worker.js

@@ -4,8 +4,8 @@ import { compileProgram } from './host.js';
 import { lower } from './lower.js';
 import { checkText, encode } from './values.js';
 try {
-    const { source, types, channelContracts } = workerData;
-    const result = lower(await compileProgram(source), new Set(channelContracts));
+    const { source, types } = workerData;
+    const result = lower(await compileProgram(source));
     const artifacts = Object.create(null);
     artifacts['FLOW.contract.json'] = encode(result.descriptor);
     for (const [path, schema] of Object.entries(result.projections))

package/libexec/evaluator/project-authoring-1.schema.json

@@ -96,6 +96,12 @@
             "$ref": "#/$defs/defaultSelector"
           },
           "maxProperties": 256
+        },
+        "entrypoint": {
+          "type": "string",
+          "minLength": 1,
+          "maxLength": 16384,
+          "description": "An exact Run target followed by optional Jig run invocation arguments. Jig validates quoting, permitted options, project-relative paths and target membership. No shell execution or expansion."
         }
       },
       "additionalProperties": false
@@ -167,8 +173,16 @@
             }
           },
           "required": ["kind", "client"],
-          "if": { "required": ["retainSessions"] },
-          "then": { "properties": { "client": { "const": "codex" } } },
+          "if": {
+            "required": ["retainSessions"]
+          },
+          "then": {
+            "properties": {
+              "client": {
+                "const": "codex"
+              }
+            }
+          },
           "additionalProperties": false
         },
         {

package/libexec/evaluator/project-evaluator-sdk.bundle.js

@@ -1997,7 +1997,7 @@ function defineJig(input) {
 }
 function normalizeJig(input, canonical) {
   const captured = snapshotJsonObject(input, "Jig definition");
-  assertClosedObject(captured, ["flows", "bindings", "grants", "defaultProviders"], "Jig definition");
+  assertClosedObject(captured, ["flows", "bindings", "grants", "defaultProviders", "entrypoint"], "Jig definition");
   const output = {};
   if (Object.hasOwn(captured, "flows")) {
     output.flows = normalizeSource(captured.flows, "flows", canonical);
@@ -2011,6 +2011,11 @@ function normalizeJig(input, canonical) {
   if (Object.hasOwn(captured, "defaultProviders")) {
     output.defaultProviders = normalizeDefaultProviders(captured.defaultProviders);
   }
+  if (Object.hasOwn(captured, "entrypoint")) {
+    if (typeof captured.entrypoint !== "string" || captured.entrypoint.trim().length === 0 || captured.entrypoint.length > 16384)
+      throw new TypeError("entrypoint must be a nonempty string of at most 16384 characters");
+    output.entrypoint = captured.entrypoint;
+  }
   return record(output);
 }
 function normalizeDefaultProviders(value) {