team 0.1.1 → 0.1.2

package/dist/watch/screen-file.js

@@ -50,14 +50,16 @@ function stageOf(node) {
 }
 function ruleOf(node, ignoreCase) {
     const entries = mapping(node, 'a rule');
-    only(entries, ['any', 'all', 'footer', 'below_last_rule', 'none_after']);
+    only(entries, ['any', 'all', 'footer', 'on_footer', 'below_last_rule', 'without_rule', 'none_after']);
     if (entries.length === 0)
         fail(node.line, 'a rule has no primitive');
     const rule = {};
     const any = optional(entries, 'any');
     const all = optional(entries, 'all');
     const footer = optional(entries, 'footer');
+    const onFooter = optional(entries, 'on_footer');
     const below = optional(entries, 'below_last_rule');
+    const withoutRule = optional(entries, 'without_rule');
     const noneAfter = optional(entries, 'none_after');
     if (any)
         rule.any = patternsOf(any.value, 'any', ignoreCase);
@@ -65,8 +67,12 @@ function ruleOf(node, ignoreCase) {
         rule.all = patternsOf(all.value, 'all', ignoreCase);
     if (footer)
         rule.footer = stringOf(footer.value) ?? fail(footer.line, '"footer" must be a string');
+    if (onFooter)
+        rule.onFooter = boolOf(onFooter.value, 'on_footer');
     if (below)
         rule.belowLastRule = patternOf(stringOf(below.value) ?? fail(below.line, '"below_last_rule" must be a string'), ignoreCase, below.line);
+    if (withoutRule)
+        rule.withoutRule = boolOf(withoutRule.value, 'without_rule');
     if (noneAfter)
         rule.noneAfter = noneAfterOf(noneAfter.value, ignoreCase);
     return rule;
@@ -116,16 +122,20 @@ function composerOf(node) {
     const entries = mapping(node, 'composer');
     const mode = required(entries, 'mode', node.line);
     const name = stringOf(mode.value);
+    // How the CLI renders its greyed suggestions, read off the input line's styling. Optional:
+    // a composer whose suggestions plain text already names needs none of it.
+    const style = optional(entries, 'placeholder_style');
+    const placeholderStyle = style ? placeholderStyleOf(style) : undefined;
     if (name === 'box-to-rule') {
-        only(entries, ['mode', 'prompt', 'rule', 'placeholders']);
-        return { mode: name, prompt: regexField(entries, 'prompt', node.line), rule: regexField(entries, 'rule', node.line), placeholders: placeholdersOf(required(entries, 'placeholders', node.line).value) };
+        only(entries, ['mode', 'prompt', 'rule', 'placeholders', 'placeholder_style']);
+        return { mode: name, prompt: regexField(entries, 'prompt', node.line), rule: regexField(entries, 'rule', node.line), placeholders: placeholdersOf(required(entries, 'placeholders', node.line).value), placeholderStyle };
     }
     if (name === 'status-last') {
-        only(entries, ['mode', 'status_line', 'prompt', 'placeholders']);
-        return { mode: name, statusLine: regexField(entries, 'status_line', node.line), prompt: regexField(entries, 'prompt', node.line), placeholders: placeholdersOf(required(entries, 'placeholders', node.line).value) };
+        only(entries, ['mode', 'status_line', 'prompt', 'placeholders', 'placeholder_style']);
+        return { mode: name, statusLine: regexField(entries, 'status_line', node.line), prompt: regexField(entries, 'prompt', node.line), placeholders: placeholdersOf(required(entries, 'placeholders', node.line).value), placeholderStyle };
     }
     if (name === 'status-then-one') {
-        only(entries, ['mode', 'status_line', 'prompt', 'placeholders', 'strip_suffix', 'fallback']);
+        only(entries, ['mode', 'status_line', 'prompt', 'placeholders', 'placeholder_style', 'strip_suffix', 'fallback']);
         const suffix = optional(entries, 'strip_suffix');
         const fallback = required(entries, 'fallback', node.line);
         return {
@@ -133,12 +143,13 @@ function composerOf(node) {
             statusLine: regexField(entries, 'status_line', node.line),
             prompt: regexField(entries, 'prompt', node.line),
             placeholders: placeholdersOf(required(entries, 'placeholders', node.line).value),
+            placeholderStyle,
             stripSuffix: suffix ? patternOf(stringOf(suffix.value) ?? fail(suffix.line, '"strip_suffix" must be a string'), false, suffix.line) : null,
             fallback: fallbackOf(fallback.value),
         };
     }
     if (name === 'two-rules-footer-below') {
-        only(entries, ['mode', 'ignore_case', 'prompt', 'rule', 'footers', 'placeholders']);
+        only(entries, ['mode', 'ignore_case', 'prompt', 'rule', 'footers', 'placeholders', 'placeholder_style']);
         const flag = optional(entries, 'ignore_case');
         const ignoreCase = flag ? boolOf(flag.value, 'ignore_case') : false;
         const footers = required(entries, 'footers', node.line);
@@ -155,10 +166,17 @@ function composerOf(node) {
                 return patternOf(text, ignoreCase, item.line);
             }),
             placeholders: placeholdersOf(required(entries, 'placeholders', node.line).value),
+            placeholderStyle,
         };
     }
     fail(mode.line, `"mode" must be box-to-rule, status-last, status-then-one or two-rules-footer-below`);
 }
+function placeholderStyleOf(entry) {
+    const text = stringOf(entry.value);
+    if (text !== 'dim')
+        fail(entry.line, '"placeholder_style" must be dim');
+    return text;
+}
 function fallbackOf(node) {
     if (node.kind !== 'seq')
         fail(node.line, '"fallback" must be a list');

package/dist/watch/screen.d.ts

@@ -19,6 +19,7 @@ export declare function classify(cli: string, lines: string[]): Screen;
 export declare function classifyComposer(cli: string, lines: string[]): Screen;
 export declare function readScreen(cli: string, screen: string | undefined): Screen;
 /** The one line a quota figure may come from: the composer's own status row, in the pane's last
- * 20 lines. Null for a CLI with no status line, and for a window that shows no status row — a
- * dialog, a question, a trust screen, a shell or an unknown one reads no figures. */
+ * 20 lines, read plain — a figure is never styled. Null for a CLI with no status line, and for
+ * a window that shows no status row — a dialog, a question, a trust screen, a shell or an
+ * unknown one reads no figures. */
 export declare function statusRow(cli: string, screen: string | undefined): string | null;

package/dist/watch/screen.js

@@ -1,6 +1,9 @@
 // What a pane's visible text shows, read against the shapes of its CLI. A screen that matches no
 // shape is "unknown": never ready, never idle, and never grounds for typing anything.
+// The text may keep its ANSI styling, as `herdr pane read --format ansi` reads it: matching
+// runs on the plain form, and the styling tells a greyed suggestion from typed text.
 import { readFileSync } from 'node:fs';
+import { stripSgr } from "../ansi.js";
 import { classifyLines, composeLines, statusRowOf } from "./screen-core.js";
 import { loadScreen } from "./screen-file.js";
 function load(name) {
@@ -13,7 +16,8 @@ const DATA = {
     cursor: load('cursor'),
     antigravity: load('antigravity'),
 };
-// The window every pattern sees: the pane's last 20 lines, each trimmed at the end.
+// The window every pattern sees: the pane's last 20 lines. Styled lines are trimmed only past
+// their last escape; the core trims each line's plain form for matching.
 function windowOf(lines) {
     return lines.map((line) => line.trimEnd()).slice(-20);
 }
@@ -37,11 +41,12 @@ export function readScreen(cli, screen) {
     return classify(cli, screen.split('\n'));
 }
 /** The one line a quota figure may come from: the composer's own status row, in the pane's last
- * 20 lines. Null for a CLI with no status line, and for a window that shows no status row — a
- * dialog, a question, a trust screen, a shell or an unknown one reads no figures. */
+ * 20 lines, read plain — a figure is never styled. Null for a CLI with no status line, and for
+ * a window that shows no status row — a dialog, a question, a trust screen, a shell or an
+ * unknown one reads no figures. */
 export function statusRow(cli, screen) {
     const data = DATA[cli];
     if (data === undefined || screen === undefined)
         return null;
-    return statusRowOf(data, windowOf(screen.split('\n')));
+    return statusRowOf(data, windowOf(stripSgr(screen).split('\n')));
 }

package/examples/team.yaml

@@ -49,6 +49,7 @@ seats:
     label: codex
     cli: codex
     vendor: openai
+    account: openai-team       # the seat's account, when one vendor has two; absent, its vendor
     model: GPT Comet
     version: "3"
     display: GPT-3 Comet       # the vendor's spelling, for the signature
@@ -74,3 +75,10 @@ seats:
     version: "1"
     launch: nimbus-claude      # a launcher on the PATH, holding the account's key and endpoint
     count: 3
+
+budgets:                      # the owner's: what is budgeted, and how long a figure stays fresh
+  accounts:
+    openai-team:              # the account codex-beacon spends
+      kind: subscription
+      reserve: 20%            # refuse a launch on a figure inside it
+      sources: [status_line]  # Codex's status line carries its weekly figure

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "team",
-  "version": "0.1.1",
+  "version": "0.1.2",
   "description": "Set up, change and watch a project's team of AI agents from one file",
   "keywords": [
     "ai-agents",