@vimhead.dev/norn 0.1.0-tip.35436871363.1 → 0.1.0-tip.35570530940.1

package/dist/api.d.ts

@@ -18,8 +18,7 @@ export type NornWorkflowDeclaration<Id extends string = string, ArgsSchema exten
     (args: StaticEncode<ArgsSchema>): NornRunNext;
     readonly kind: typeof WORKFLOW_DECLARATION_KIND;
     readonly id: Id;
-    readonly isEntrypoint: boolean;
-    readonly instructions?: string;
+    readonly entrypoint: NornWorkflowEntrypoint;
     readonly args: ArgsSchema;
     readonly gate?: NornWorkflowGate<ArgsSchema> & {
         describe?(context: NornWorkflowContext<ArgsSchema, ConfigSchema, Scope>): MaybePromise<string>;
@@ -43,18 +42,17 @@ export type NornWorkflowGate<ArgsSchema extends TSchema> = unknown extends Stati
     readonly enabled: true;
     readonly fields?: never;
 };
-type NornWorkflowInstructions = {
-    readonly isEntrypoint: true;
+export type NornWorkflowEntrypoint = false | {
     readonly instructions: string;
-} | {
-    readonly isEntrypoint: false;
-    readonly instructions?: string;
 };
 type WorkflowConfig<Schema extends TSchema | undefined> = Schema extends TSchema ? StaticDecode<Schema> : undefined;
 export type NornWorkflowContext<ArgsSchema extends TSchema = TSchema, ConfigSchema extends TSchema | undefined = TSchema | undefined, Scope extends NornWorkflowScopeInfo | undefined = NornWorkflowScopeInfo | undefined> = {
     readonly args: StaticDecode<ArgsSchema>;
     readonly config: WorkflowConfig<ConfigSchema>;
     readonly paths: NornWorkflowPaths;
+    readonly agents: NornAgents;
+    readonly commands: NornCommands;
+    readonly logs: NornLogs;
     readonly run: NornRun;
 } & (Scope extends NornWorkflowScopeInfo ? {
     readonly scope: {
@@ -62,35 +60,36 @@ export type NornWorkflowContext<ArgsSchema extends TSchema = TSchema, ConfigSche
         readonly config: WorkflowConfig<Scope["config"]>;
     };
 } : {});
-export type NornWorkflowDefinition<Id extends string = string, ArgsSchema extends TSchema = TSchema, ConfigSchema extends TSchema | undefined = undefined, Scope extends NornWorkflowScopeInfo | undefined = undefined> = {
-    readonly id: Id;
+export type NornWorkflowDefinition<Name extends string = string, ArgsSchema extends TSchema = TSchema, ConfigSchema extends TSchema | undefined = undefined, Scope extends NornWorkflowScopeInfo | undefined = undefined> = {
+    readonly name: Name;
+    readonly entrypoint: NornWorkflowEntrypoint;
     readonly args: ArgsSchema;
     readonly config?: ConfigSchema;
     readonly gate?: NornWorkflowGate<ArgsSchema> & {
         describe?(context: NornWorkflowContext<ArgsSchema, ConfigSchema, Scope>): MaybePromise<string>;
     };
     execute(context: NornWorkflowContext<ArgsSchema, ConfigSchema, Scope>): MaybePromise<WorkflowResult>;
-} & NornWorkflowInstructions;
+};
 export type NornWorkflowScopeInfo = {
     readonly id: string;
     readonly config?: TSchema;
 };
-export type NornWorkflowScope<Id extends string, ConfigSchema extends TSchema | undefined> = {
-    readonly id: Id;
+export type NornWorkflowScope<Name extends string, ConfigSchema extends TSchema | undefined> = {
+    readonly id: Name;
     readonly config: ConfigSchema;
-    workflow<const LocalId extends string, ArgsSchema extends TSchema, LocalConfig extends TSchema | undefined = undefined>(definition: NornWorkflowDefinition<LocalId, ArgsSchema, LocalConfig, {
-        readonly id: Id;
+    workflow<const LocalName extends string, ArgsSchema extends TSchema, LocalConfig extends TSchema | undefined = undefined>(definition: NornWorkflowDefinition<LocalName, ArgsSchema, LocalConfig, {
+        readonly id: Name;
         readonly config: ConfigSchema;
-    }>): NornWorkflowDeclaration<`${Id}.${LocalId}`, ArgsSchema, LocalConfig, {
-        readonly id: Id;
+    }>): NornWorkflowDeclaration<`${Name}.${LocalName}`, ArgsSchema, LocalConfig, {
+        readonly id: Name;
         readonly config: ConfigSchema;
     }>;
 };
-export declare function workflow<const Id extends string, ArgsSchema extends TSchema, ConfigSchema extends TSchema | undefined = undefined>(definition: NornWorkflowDefinition<Id, ArgsSchema, ConfigSchema>): NornWorkflowDeclaration<Id, ArgsSchema, ConfigSchema, undefined>;
-export declare function workflowScope<const Id extends string, ConfigSchema extends TSchema | undefined = undefined>(input: {
-    readonly id: Id;
+export declare function workflow<const Name extends string, ArgsSchema extends TSchema, ConfigSchema extends TSchema | undefined = undefined>(definition: NornWorkflowDefinition<Name, ArgsSchema, ConfigSchema>): NornWorkflowDeclaration<Name, ArgsSchema, ConfigSchema, undefined>;
+export declare function workflowScope<const Name extends string, ConfigSchema extends TSchema | undefined = undefined>(input: {
+    readonly name: Name;
     readonly config?: ConfigSchema;
-}): NornWorkflowScope<Id, ConfigSchema>;
+}): NornWorkflowScope<Name, ConfigSchema>;
 export type NornRunNext = {
     readonly type: "next";
     readonly workflowId: string;
@@ -364,16 +363,16 @@ export type NornRun = {
     fail(metadata: NornRunOutcomeMetadata & {
         readonly summary: string;
     }): NornRunFail;
-    logs: {
-        read(log: NornLogRef): Promise<string>;
-    };
-    commands: {
-        run(input: NornCommandRunInput): Promise<NornCommandRunResult>;
-    };
-    agents: {
-        createSession(input: NornAgentCreateSessionInput): Promise<NornAgentSession>;
-        prompt<ResponseSchema extends TSchema>(input: NornAgentSinglePromptInput<ResponseSchema>): Promise<StaticDecode<ResponseSchema>>;
-    };
+};
+export type NornLogs = {
+    read(log: NornLogRef): Promise<string>;
+};
+export type NornCommands = {
+    run(input: NornCommandRunInput): Promise<NornCommandRunResult>;
+};
+export type NornAgents = {
+    createSession(input: NornAgentCreateSessionInput): Promise<NornAgentSession>;
+    prompt<ResponseSchema extends TSchema>(input: NornAgentSinglePromptInput<ResponseSchema>): Promise<StaticDecode<ResponseSchema>>;
 };
 export type NornWorkflowSource = {
     readonly path: string;

package/dist/api.js

@@ -12,29 +12,29 @@ import { Value } from "typebox/value";
 import { assertWorkflowMetadata, isPlainObject, jsonValueSchema } from "./schema.js";
 var WORKFLOW_DECLARATION_KIND = "norn.workflow";
 function workflow(definition) {
-  return createWorkflow({ definition, scope: void 0 });
+  return createWorkflow({ definition, id: definition.name, scope: void 0 });
 }
 function createWorkflow(input) {
-  const { definition, scope } = input;
-  assertDeclarationId(definition.id);
-  const callable = (args) => createWorkflowTransition({ workflowId: definition.id, args });
-  const result = Object.assign(callable, definition, {
+  const { definition: { name, ...properties }, id, scope } = input;
+  assertDeclarationName(name);
+  const callable = (args) => createWorkflowTransition({ workflowId: id, args });
+  const result = Object.assign(callable, properties, {
     kind: WORKFLOW_DECLARATION_KIND,
+    id,
     scope
   });
-  if (!isWorkflowDeclaration(result)) throw new Error(`Invalid workflow definition: ${definition.id}`);
   assertWorkflowMetadata(result);
+  if (!isWorkflowDeclaration(result)) throw new Error(`Invalid workflow definition: ${id}`);
   return result;
 }
 function workflowScope(input) {
-  assertDeclarationId(input.id);
-  const scope = { id: input.id, config: input.config };
+  assertDeclarationName(input.name);
+  const scope = { id: input.name, config: input.config };
   return {
-    id: input.id,
-    config: input.config,
+    id: scope.id,
+    config: scope.config,
     workflow(definition) {
-      assertDeclarationId(definition.id);
-      return createWorkflow({ definition: { ...definition, id: `${input.id}.${definition.id}` }, scope });
+      return createWorkflow({ definition, id: `${scope.id}.${definition.name}`, scope });
     }
   };
 }
@@ -56,13 +56,13 @@ function workflowRefSchema(options) {
     };
   }), { "x-norn-workflow-ref": { contributedArgsSchema: contributionSchema } });
 }
-function assertDeclarationId(id) {
-  if (typeof id !== "string" || id.trim().length === 0 || id.split(".").some((segment) => segment.length === 0)) throw new Error(`Invalid workflow or scope id: ${id}`);
+function assertDeclarationName(name) {
+  if (typeof name !== "string" || name.trim().length === 0 || name.includes(".")) throw new Error(`Invalid workflow or scope name: ${name}; expected a nonempty name without dots`);
 }
 function isWorkflowDeclaration(value) {
   if (typeof value !== "function") return false;
   const candidate = value;
-  return candidate.kind === WORKFLOW_DECLARATION_KIND && typeof candidate.id === "string" && candidate.id.length > 0 && (candidate.instructions === void 0 || typeof candidate.instructions === "string") && typeof candidate.isEntrypoint === "boolean" && Boolean(candidate.args) && typeof candidate.execute === "function";
+  return candidate.kind === WORKFLOW_DECLARATION_KIND && typeof candidate.id === "string" && candidate.id.length > 0 && (candidate.entrypoint === false || isPlainObject(candidate.entrypoint) && typeof candidate.entrypoint.instructions === "string") && Boolean(candidate.args) && typeof candidate.execute === "function";
 }
 function isWorkflowNext(value) {
   if (!value || typeof value !== "object") return false;

package/dist/schema.js

@@ -40,11 +40,11 @@ function assertWorkflowReferenceAnnotations(schema) {
   }
 }
 function assertWorkflowMetadata(workflow) {
-  if (workflow.instructions !== void 0 && (typeof workflow.instructions !== "string" || workflow.instructions.trim().length === 0)) {
-    throw new Error(`Workflow instructions must be a nonempty string: ${workflow.id}`);
-  }
-  if (workflow.isEntrypoint && workflow.instructions === void 0) {
-    throw new Error(`Entrypoint workflow requires instructions: ${workflow.id}`);
+  const { entrypoint } = workflow;
+  if (entrypoint === false) return;
+  if (!isPlainObject(entrypoint)) throw new Error(`Workflow entrypoint must be false or an object with instructions: ${workflow.id}`);
+  if (typeof entrypoint.instructions !== "string" || entrypoint.instructions.trim().length === 0) {
+    throw new Error(`Workflow entrypoint.instructions must be a nonempty string: ${workflow.id}`);
   }
 }
 function unwrapSchema(schema) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vimhead.dev/norn",
-  "version": "0.1.0-tip.35436871363.1",
+  "version": "0.1.0-tip.35570530940.1",
   "description": "TypeScript SDK for building agent-driven and code-driven Norn workflows.",
   "type": "module",
   "license": "MIT",