@prestack/thread 0.1.6 → 0.1.8

package/dist/knowledge/attach.js

@@ -238,23 +238,6 @@ export const CONCEPTS: readonly Concept[] = [
   },
 ]
 `;
-const OWN = [
-    {
-        into: 'knowledge.ts',
-        list: 'declares',
-        id: 'skills',
-        source: [
-            '    {',
-            "      id: 'skills',",
-            "      at: '_threads/_generated/skills.ts',",
-            "      describes: 'One row per skill `thread skills` writes, so every `skills/<noun>.md` is declared by the command that wrote it instead of being refused as a file nothing named. It sits beside the files it names because the nouns are not known until the tree is read, and a list somebody keeps by hand would go stale the first time a package brings a new maker.',",
-            '      version: 1,',
-            "      by: 'thread skills',",
-            "      runs: 'thread skills --check',",
-            '    },',
-        ].join('\n'),
-    },
-];
 const SEEDED = {
     attaches: ['@prestack/thread/derivation/attach'],
     id: 'knowledge',
@@ -330,5 +313,5 @@ export const ATTACH = {
             source: CONCEPTS_SOURCE,
         },
     ],
-    rows: [...OWN, ...SHIPPED],
+    rows: SHIPPED,
 };

package/dist/knowledge/attach.ts

@@ -246,24 +246,6 @@ export const CONCEPTS: readonly Concept[] = [
 ]
 `
 
-const OWN: readonly { readonly into: string; readonly list: string; readonly id: string; readonly source: string }[] = [
-  {
-    into: 'knowledge.ts',
-    list: 'declares',
-    id: 'skills',
-    source: [
-      '    {',
-      "      id: 'skills',",
-      "      at: '_threads/_generated/skills.ts',",
-      "      describes: 'One row per skill `thread skills` writes, so every `skills/<noun>.md` is declared by the command that wrote it instead of being refused as a file nothing named. It sits beside the files it names because the nouns are not known until the tree is read, and a list somebody keeps by hand would go stale the first time a package brings a new maker.',",
-      '      version: 1,',
-      "      by: 'thread skills',",
-      "      runs: 'thread skills --check',",
-      '    },',
-    ].join('\n'),
-  },
-]
-
 const SEEDED = {
   attaches: ['@prestack/thread/derivation/attach'] as const,
   id: 'knowledge',
@@ -341,5 +323,5 @@ export const ATTACH: Attaching = {
       source: CONCEPTS_SOURCE,
     },
   ],
-  rows: [...OWN, ...SHIPPED],
+  rows: SHIPPED,
 }

package/dist/knowledge/generators/docsgen.ts

@@ -1,5 +1,5 @@
 import { existsSync, readFileSync, writeFileSync } from '../../integrations/disk.ts'
-import { dirname, resolve } from 'node:path'
+import { resolve } from 'node:path'
 import { argv, stderr, stdout } from 'node:process'
 
 import { exit } from '../../core/invoked.ts'

package/dist/operations/generators/capability.js

@@ -535,6 +535,7 @@ export function reaching(targets, calls, stores, vaulted, carried) {
         const file = (one.declares ?? [])[0]?.at;
         return file === undefined ? [] : [{ from: beside(REACHING_AT, file), as: 'c' + String(at), of: one.id }];
     });
+    const used = new Set();
     const opened = targets
         .map((one) => {
         const reach = reachOf(one.id);
@@ -545,32 +546,43 @@ export function reaching(targets, calls, stores, vaulted, carried) {
             const each = calls
                 .filter((call) => call.of === one.id && one.takes.includes(call.id))
                 .map((call) => quoted(call.id.replace(/^cl_/, '')) + ': ' + held.as + '[' + quoted(call.path) + ']');
+            if (each.length > 0)
+                used.add(held.as);
             return '  ' + one.id + ': { ' + each.join(', ') + ' },';
         }
         if (reach === 'disk') {
             const through = one.requires.find((each) => reachOf(each) !== undefined);
-            return through === undefined ? '  ' + one.id + ': HERE,' : '';
+            if (through !== undefined)
+                return '';
+            used.add('HERE');
+            return '  ' + one.id + ': HERE,';
         }
         if (reach === 'cli') {
             const each = calls
                 .filter((call) => call.of === one.id && one.takes.includes(call.id))
                 .map((call) => quoted(call.id.replace(/^cl_/, '')) + ': ' + quoted(call.path));
+            used.add('running');
             return '  ' + one.id + ': running(' + quoted(one.id.replace(/^cli_/, '')) + ', { ' + each.join(', ') + ' }, process.cwd()),';
         }
-        if (reach === 'https')
+        if (reach === 'https') {
+            used.add('sendingHttp');
             return '  ' + one.id + ': sendingHttp(),';
+        }
         const held = named.find((each) => each.of === one.id);
-        return held === undefined ? '' : '  ' + one.id + ': ' + held.as + ',';
+        if (held === undefined)
+            return '';
+        used.add(held.as);
+        return '  ' + one.id + ': ' + held.as + ',';
     })
         .filter((each) => each !== '');
     return [
-        'import { HERE } from ' + quoted(runtime(REACHING_AT, '../../integrations/disk.ts')),
-        'import { running } from ' + quoted(runtime(REACHING_AT, '../../integrations/cli.ts')),
-        'import { sendingHttp } from ' + quoted(runtime(REACHING_AT, '../../integrations/https.ts')),
+        ...(used.has('HERE') ? ['import { HERE } from ' + quoted(runtime(REACHING_AT, '../../integrations/disk.ts'))] : []),
+        ...(used.has('running') ? ['import { running } from ' + quoted(runtime(REACHING_AT, '../../integrations/cli.ts'))] : []),
+        ...(used.has('sendingHttp') ? ['import { sendingHttp } from ' + quoted(runtime(REACHING_AT, '../../integrations/https.ts'))] : []),
         'import type { Counting } from ' +
             quoted(carried ? packageOf('operations') + '/operations/operations' : runtime(REACHING_AT, '../operations.ts')),
-        ...named.map((each) => 'import { store as ' + each.as + ' } from ' + quoted(each.from)),
-        ...adapted.map((each) => 'import { calls as ' + each.as + ' } from ' + quoted(each.from)),
+        ...named.filter((each) => used.has(each.as)).map((each) => 'import { store as ' + each.as + ' } from ' + quoted(each.from)),
+        ...adapted.filter((each) => used.has(each.as)).map((each) => 'import { calls as ' + each.as + ' } from ' + quoted(each.from)),
         ...(vaulted ? ['import { vault } from ' + quoted(beside(REACHING_AT, VAULT_AT))] : []),
         '',
         'declare module ' +
@@ -807,7 +819,6 @@ if (invoked(import.meta.url)) {
     }
     const checking = argv.includes('--check');
     let adrift = 0;
-    const keeping = existsSync(resolve(ROOT, ENTITIES_AT));
     if (found.length === 0 && refusals.length === 0) {
         console.log('capabilities: this app declares no operation, so nothing is reachable through one yet.');
         exit(adrift > 0 ? 1 : 0);

package/dist/operations/generators/capability.ts

@@ -11,7 +11,7 @@ import { named as packageOf } from '../../core/scope.ts'
 import { PREFIXES } from '../../core/thread.ts'
 
 import { secrecyOf, type Secret } from '../../integrations/secret.ts'
-import { reachOf, servesBrowser, standsHere, targetOf, type Call, type Target, type Webhook } from '../../integrations/target.ts'
+import { reachOf, servesBrowser, targetOf, type Call, type Target, type Webhook } from '../../integrations/target.ts'
 
 import {
   CAPABILITIES_AT,
@@ -33,7 +33,6 @@ import {
   type Surface,
 } from '../capabilities.ts'
 import { ANONYMOUS, ENVIRONMENT } from '../../core/actor.ts'
-import { PERMITS_AT } from '../access.ts'
 import { DISPATCH_AT } from '../dispatch.ts'
 import { STREAMED, TOLD } from '../../integrations/https.ts'
 import { holdsRow, listBounds, marked, nestedBounds, rowsIn, valuesIn, withField, withRow, withTopField, withoutRow } from '../../core/rows.ts'
@@ -642,6 +641,7 @@ export function reaching(
       return file === undefined ? [] : [{ from: beside(REACHING_AT, file), as: 'c' + String(at), of: one.id }]
     })
 
+  const used = new Set<string>()
   const opened = targets
     .map((one) => {
       const reach = reachOf(one.id)
@@ -651,32 +651,41 @@ export function reaching(
         const each = calls
           .filter((call) => call.of === one.id && one.takes.includes(call.id))
           .map((call) => quoted(call.id.replace(/^cl_/, '')) + ': ' + held.as + '[' + quoted(call.path) + ']')
+        if (each.length > 0) used.add(held.as)
         return '  ' + one.id + ': { ' + each.join(', ') + ' },'
       }
       if (reach === 'disk') {
         const through = one.requires.find((each) => reachOf(each) !== undefined)
-        return through === undefined ? '  ' + one.id + ': HERE,' : ''
+        if (through !== undefined) return ''
+        used.add('HERE')
+        return '  ' + one.id + ': HERE,'
       }
       if (reach === 'cli') {
         const each = calls
           .filter((call) => call.of === one.id && one.takes.includes(call.id))
           .map((call) => quoted(call.id.replace(/^cl_/, '')) + ': ' + quoted(call.path))
+        used.add('running')
         return '  ' + one.id + ': running(' + quoted(one.id.replace(/^cli_/, '')) + ', { ' + each.join(', ') + ' }, process.cwd()),'
       }
-      if (reach === 'https') return '  ' + one.id + ': sendingHttp(),'
+      if (reach === 'https') {
+        used.add('sendingHttp')
+        return '  ' + one.id + ': sendingHttp(),'
+      }
       const held = named.find((each) => each.of === one.id)
-      return held === undefined ? '' : '  ' + one.id + ': ' + held.as + ','
+      if (held === undefined) return ''
+      used.add(held.as)
+      return '  ' + one.id + ': ' + held.as + ','
     })
     .filter((each) => each !== '')
 
   return [
-    'import { HERE } from ' + quoted(runtime(REACHING_AT, '../../integrations/disk.ts')),
-    'import { running } from ' + quoted(runtime(REACHING_AT, '../../integrations/cli.ts')),
-    'import { sendingHttp } from ' + quoted(runtime(REACHING_AT, '../../integrations/https.ts')),
+    ...(used.has('HERE') ? ['import { HERE } from ' + quoted(runtime(REACHING_AT, '../../integrations/disk.ts'))] : []),
+    ...(used.has('running') ? ['import { running } from ' + quoted(runtime(REACHING_AT, '../../integrations/cli.ts'))] : []),
+    ...(used.has('sendingHttp') ? ['import { sendingHttp } from ' + quoted(runtime(REACHING_AT, '../../integrations/https.ts'))] : []),
     'import type { Counting } from ' +
       quoted(carried ? packageOf('operations') + '/operations/operations' : runtime(REACHING_AT, '../operations.ts')),
-    ...named.map((each) => 'import { store as ' + each.as + ' } from ' + quoted(each.from)),
-    ...adapted.map((each) => 'import { calls as ' + each.as + ' } from ' + quoted(each.from)),
+    ...named.filter((each) => used.has(each.as)).map((each) => 'import { store as ' + each.as + ' } from ' + quoted(each.from)),
+    ...adapted.filter((each) => used.has(each.as)).map((each) => 'import { calls as ' + each.as + ' } from ' + quoted(each.from)),
     ...(vaulted ? ['import { vault } from ' + quoted(beside(REACHING_AT, VAULT_AT))] : []),
     '',
     'declare module ' +
@@ -951,8 +960,6 @@ if (invoked(import.meta.url)) {
   const checking = argv.includes('--check')
   let adrift = 0
 
-  const keeping = existsSync(resolve(ROOT, ENTITIES_AT))
-
   if (found.length === 0 && refusals.length === 0) {
     console.log('capabilities: this app declares no operation, so nothing is reachable through one yet.')
     exit(adrift > 0 ? 1 : 0)

package/dist/operations/generators/compile.js

@@ -152,7 +152,8 @@ function answers(node, found) {
         answers(one, found);
     });
 }
-function spliced(text, names, mine, roles) {
+function spliced(text, shape, roles) {
+    const { names, mine } = shape;
     const read = arrowIn(text, roles);
     if (typeof read === 'string')
         return read;
@@ -190,6 +191,7 @@ function spliced(text, names, mine, roles) {
                     return;
                 }
                 edits.push({ from: up.getStart(), to: up.getEnd(), text: said });
+                shape.heard.add(said);
                 return;
             }
             because = `reaches for \`${read.held}\` itself rather than one thing on it, and once every node is a local there is no such thing to hand it`;
@@ -232,19 +234,20 @@ function spliced(text, names, mine, roles) {
     return { form: 'call', text: whole, whole };
 }
 const ANSWERS = `${OWN}ANSWER`;
-function answered(name, one, opened, kind) {
+const linesOf = (one, name, unread) => (unread ? `${one.text.replace(`${ANSWERS} = `, 'void (')})` : one.text.replace(ANSWERS, name)).split('\n');
+function answered(name, one, opened, kind, unread) {
     if (one.form === 'expression')
-        return [`${kind} ${name}: unknown = ${one.text}`];
+        return [unread ? `void (${one.text})` : `${kind} ${name}: unknown = ${one.text}`];
     if (one.form === 'statements') {
-        return [`let ${name}: unknown`, '{', ...one.text.split('\n').map((line) => `  ${line.replace(ANSWERS, name)}`), '}'];
+        return [...(unread ? [] : [`let ${name}: unknown`]), '{', ...linesOf(one, name, unread).map((line) => `  ${line}`), '}'];
     }
-    return [`${kind} ${name}: unknown = await ${asFn(one.whole, opened)}(opened)`];
+    return [`${unread ? '' : `${kind} ${name}: unknown = `}await ${asFn(one.whole, opened)}(opened)`];
 }
 const asFn = (text, opened, more = '') => `((${text}) as (${more}opened: ${opened}) => Promise<unknown>)`;
 function forked(name, said, shape) {
     if (said.length !== 2)
         return `takes a chooser and the ways it chooses between, and was handed ${String(said.length)} thing(s)`;
-    const chose = spliced(said[0] ?? '', shape.names, shape.mine, ROLES.block);
+    const chose = spliced(said[0] ?? '', shape, ROLES.block);
     if (typeof chose === 'string')
         return `chooses with a block that ${chose}`;
     const held = inside(said[1] ?? '', '{', '}');
@@ -252,25 +255,26 @@ function forked(name, said, shape) {
     const named = ways?.every((one) => one !== undefined && PLAIN.test(one.key)) === true ? ways : undefined;
     if (named === undefined || named.length === 0)
         return 'names its ways in a way this cannot read — write each one as `name: block`';
+    const unread = shape.unread.has(name);
     const picked = `${OWN}${name}_said`;
     const runs = [
-        `let ${name}: unknown`,
+        ...(unread ? [] : [`let ${name}: unknown`]),
         chose.form === 'expression'
             ? `const ${picked}: string = await (${chose.text})`
             : `const ${picked}: string = await ((${said[0] ?? ''}) as (opened: ${shape.reads}) => Promise<string>)(opened)`,
         `switch (${picked}) {`,
     ];
     for (const way of named) {
-        const each = spliced(way?.held ?? '', shape.names, shape.mine, ROLES.block);
+        const each = spliced(way?.held ?? '', shape, ROLES.block);
         if (typeof each === 'string')
             return `has a way \`${way?.key ?? ''}\` that ${each}`;
         runs.push(`  case ${(way?.key ?? '').startsWith("'") ? (way?.key ?? '') : quoted(way?.key ?? '')}: {`);
         if (each.form === 'expression')
-            runs.push(`    ${name} = ${each.text}`);
+            runs.push(unread ? `    void (${each.text})` : `    ${name} = ${each.text}`);
         else if (each.form === 'statements')
-            runs.push(...each.text.split('\n').map((line) => `    ${line.replace(ANSWERS, name)}`));
+            runs.push(...linesOf(each, name, unread).map((line) => `    ${line}`));
         else
-            runs.push(`    ${name} = await ${asFn(each.whole, shape.all)}(opened)`);
+            runs.push(`    ${unread ? '' : `${name} = `}await ${asFn(each.whole, shape.all)}(opened)`);
         runs.push('    break');
         runs.push('  }');
     }
@@ -285,23 +289,24 @@ const SHAPES = {
     nd_each: (name, said, shape) => {
         if (said.length !== 2)
             return `takes what to run over and the block to run, and was handed ${String(said.length)} thing(s)`;
-        const over = spliced(said[0] ?? '', shape.names, shape.mine, ROLES.over);
-        const block = spliced(said[1] ?? '', shape.names, shape.mine, ROLES.item);
+        const over = spliced(said[0] ?? '', shape, ROLES.over);
+        const block = spliced(said[1] ?? '', shape, ROLES.item);
         if (typeof block === 'string')
             return `runs a block that ${block}`;
         if (typeof over === 'string')
             return `runs over a block that ${over}`;
+        const unread = shape.unread.has(name);
         const item = `${OWN}${name}_item`;
         const all = `${OWN}${name}_all`;
         const each = `${OWN}${name}_each`;
         return {
             runs: [
-                `const ${all}: unknown[] = []`,
+                ...(unread ? [] : [`const ${all}: unknown[] = []`]),
                 `const ${each} = (${block.whole}) as (item: unknown, opened: ${shape.all}) => Promise<unknown>`,
                 `for (const ${item} of ${over.form === 'expression' ? `(${over.text})` : `((${over.whole}) as () => readonly unknown[])()`} as readonly unknown[]) {`,
-                `  ${all}.push(await ${each}(${item}, opened))`,
+                unread ? `  await ${each}(${item}, opened)` : `  ${all}.push(await ${each}(${item}, opened))`,
                 '}',
-                `const ${name}: unknown = ${all}`,
+                ...(unread ? [] : [`const ${name}: unknown = ${all}`]),
             ],
         };
     },
@@ -316,17 +321,17 @@ const SHAPES = {
             return 'was handed no blocks to run at once';
         const calls = [];
         for (const [order, one] of every.entries()) {
-            const each = spliced(one, shape.names, shape.mine, ROLES.block);
+            const each = spliced(one, shape, ROLES.block);
             if (typeof each === 'string')
                 return `runs a block at position ${String(order + 1)} that ${each}`;
             calls.push(each.form === 'expression' ? `(async () => ${each.text})()` : `${asFn(each.whole, shape.all)}(opened)`);
         }
-        return { runs: [`const ${name}: unknown = await Promise.all([${calls.join(', ')}])`] };
+        return { runs: [`${shape.unread.has(name) ? '' : `const ${name}: unknown = `}await Promise.all([${calls.join(', ')}])`] };
     },
     nd_repeat: (name, said, shape) => {
         if (said.length !== 2)
             return `takes a ceiling and the block to repeat, and was handed ${String(said.length)} thing(s)`;
-        const block = spliced(said[1] ?? '', shape.names, shape.mine, ROLES.again);
+        const block = spliced(said[1] ?? '', shape, ROLES.again);
         if (typeof block === 'string')
             return `repeats a block that ${block}`;
         const ceiling = `${OWN}${name}_ceiling`;
@@ -335,16 +340,17 @@ const SHAPES = {
         const done = `${OWN}${name}_done`;
         const pass = `${OWN}${name}_pass`;
         const answer = `${OWN}${name}_said`;
+        const unread = shape.unread.has(name);
         return {
             runs: [
-                `let ${name}: unknown`,
+                ...(unread ? [] : [`let ${name}: unknown`]),
                 `const ${ceiling}: number = ${said[0] ?? ''}`,
                 `const ${again} = (${block.whole}) as (pass: number, carried: unknown, opened: ${shape.all}) => Promise<{ readonly done: boolean; readonly value: unknown }>`,
                 `let ${carried}: unknown`,
                 `let ${done} = false`,
                 `for (let ${pass} = 0; ${pass} < ${ceiling}; ${pass} += 1) {`,
                 `  const ${answer} = await ${again}(${pass}, ${carried}, opened)`,
-                `  if (${answer}.done) { ${name} = ${answer}.value; ${done} = true; break }`,
+                `  if (${answer}.done) { ${unread ? '' : `${name} = ${answer}.value; `}${done} = true; break }`,
                 `  ${carried} = ${answer}.value`,
                 '}',
                 `if (!${done}) throw new Error(\`${name} reached its ceiling of \${String(${ceiling})} passes without answering done\`)`,
@@ -357,21 +363,22 @@ const STOPS = "Symbol.for('thread.operation.stopped')";
 function plainly(name, said, shape, opened, ends) {
     if (said.length !== 1)
         return `takes one block, and was handed ${String(said.length)} thing(s)`;
-    const one = spliced(said[0] ?? '', shape.names, shape.mine, ROLES.block);
+    const one = spliced(said[0] ?? '', shape, ROLES.block);
     if (typeof one === 'string')
         return one;
+    const unread = shape.unread.has(name);
     if (!ends)
-        return { runs: answered(name, one, opened, 'const') };
+        return { runs: answered(name, one, opened, 'const', unread) };
     return {
         runs: [
-            ...answered(name, one, opened, 'const'),
+            ...answered(name, one, opened, 'const', unread),
             `throw Object.assign(new Error(${quoted(`${name} ended the operation`)}), { [${STOPS}]: true, value: ${name} })`,
         ],
     };
 }
 const saidIn = (held) => held !== undefined && ts.isStringLiteral(held) ? held.text : undefined;
 const sourceIn = (held) => held?.getText();
-function compiled(at, id, one, known) {
+function compiled(at, id, one, known, unread) {
     const because = problem(id, one);
     if (because !== undefined)
         return { because };
@@ -394,6 +401,7 @@ function compiled(at, id, one, known) {
     const mine = new Set(['input', ...one.nodes.map((row) => String(row.id))]);
     const runs = [];
     const names = new Set();
+    const heard = new Set();
     let last;
     for (const [order, row] of one.nodes.entries()) {
         const name = row.id;
@@ -418,7 +426,7 @@ function compiled(at, id, one, known) {
         if (held === undefined) {
             return { because: `the node \`${name}\` states no block this can read in ${row.at} — run \`thread seed\` and write it again` };
         }
-        const shape = { all: `Opened<${only}>`, reads: `Reads<Opened<${only}>>`, names, mine };
+        const shape = { all: `Opened<${only}>`, reads: `Reads<Opened<${only}>>`, names, mine, heard, unread: unread ?? new Set() };
         const made = (SHAPES[from] ?? ownType)(name, parts(held), shape);
         if (typeof made === 'string')
             return { because: `the node \`${name}\` ${made}` };
@@ -428,12 +436,17 @@ function compiled(at, id, one, known) {
         names.add(name);
         last = from === 'nd_stop' ? undefined : name;
     }
+    if (unread === undefined) {
+        const final = one.nodes.at(-1)?.id;
+        return compiled(at, id, one, known, new Set([...mine].filter((name) => name !== final && !heard.has(name))));
+    }
+    const typed = ['Opened', 'Reads'].filter((word) => runs.some((line) => line.includes(`${word}<`)));
     return {
         text: [
             "import type { z } from 'zod'",
             '',
             `import type { Operation } from ${quoted(runtime(at, '../operations.ts'))}`,
-            'import type { Opened, Reads } from ' + quoted(runtime(at, '../operations.ts')),
+            ...(typed.length === 0 ? [] : [`import type { ${typed.join(', ')} } from ${quoted(runtime(at, '../operations.ts'))}`]),
             '',
             `import { input, resource } from ${quoted(beside(at, takes))}`,
             '',
@@ -448,7 +461,7 @@ function compiled(at, id, one, known) {
             ...(quota === undefined ? [] : [`  quota: ${quota},`]),
             '',
             '  run: async (opened, held) => {',
-            '    const input = held.input',
+            ...(unread.has('input') ? [] : ['    const input = held.input']),
             `    let ${ENTERED} = ''`,
             '    try {',
             ...runs,