march-cli 0.1.20 → 0.1.22

package/src/cli/tui/syntax/tree-sitter/toml.highlights.scm

@@ -1,39 +1,39 @@
-(bare_key) @property
-
-[
-  (string)
-  (quoted_key)
-] @string
-
-(boolean) @boolean
-
-(comment) @comment @spell
-
-(escape_sequence) @string.escape
-
-(integer) @number
-
-(float) @number.float
-
-[
-  (local_date)
-  (local_date_time)
-  (local_time)
-  (offset_date_time)
-] @string.special
-
-"=" @operator
-
-[
-  "."
-  ","
-] @punctuation.delimiter
-
-[
-  "["
-  "]"
-  "[["
-  "]]"
-  "{"
-  "}"
-] @punctuation.bracket
+(bare_key) @property
+
+[
+  (string)
+  (quoted_key)
+] @string
+
+(boolean) @boolean
+
+(comment) @comment @spell
+
+(escape_sequence) @string.escape
+
+(integer) @number
+
+(float) @number.float
+
+[
+  (local_date)
+  (local_date_time)
+  (local_time)
+  (offset_date_time)
+] @string.special
+
+"=" @operator
+
+[
+  "."
+  ","
+] @punctuation.delimiter
+
+[
+  "["
+  "]"
+  "[["
+  "]]"
+  "{"
+  "}"
+] @punctuation.bracket

package/src/cli/tui/syntax/tree-sitter/tsx.highlights.scm

@@ -1,35 +1,35 @@
-; Types
-
-(type_identifier) @type
-(predefined_type) @type.builtin
-
-((identifier) @type
- (#match? @type "^[A-Z]"))
-
-(type_arguments
-  "<" @punctuation.bracket
-  ">" @punctuation.bracket)
-
-; Variables
-
-(required_parameter (identifier) @variable.parameter)
-(optional_parameter (identifier) @variable.parameter)
-
-; Keywords
-
-[ "abstract"
-  "declare"
-  "enum"
-  "export"
-  "implements"
-  "interface"
-  "keyof"
-  "namespace"
-  "private"
-  "protected"
-  "public"
-  "type"
-  "readonly"
-  "override"
-  "satisfies"
-] @keyword
+; Types
+
+(type_identifier) @type
+(predefined_type) @type.builtin
+
+((identifier) @type
+ (#match? @type "^[A-Z]"))
+
+(type_arguments
+  "<" @punctuation.bracket
+  ">" @punctuation.bracket)
+
+; Variables
+
+(required_parameter (identifier) @variable.parameter)
+(optional_parameter (identifier) @variable.parameter)
+
+; Keywords
+
+[ "abstract"
+  "declare"
+  "enum"
+  "export"
+  "implements"
+  "interface"
+  "keyof"
+  "namespace"
+  "private"
+  "protected"
+  "public"
+  "type"
+  "readonly"
+  "override"
+  "satisfies"
+] @keyword

package/src/cli/tui/syntax/tree-sitter/typescript.highlights.scm

@@ -1,35 +1,35 @@
-; Types
-
-(type_identifier) @type
-(predefined_type) @type.builtin
-
-((identifier) @type
- (#match? @type "^[A-Z]"))
-
-(type_arguments
-  "<" @punctuation.bracket
-  ">" @punctuation.bracket)
-
-; Variables
-
-(required_parameter (identifier) @variable.parameter)
-(optional_parameter (identifier) @variable.parameter)
-
-; Keywords
-
-[ "abstract"
-  "declare"
-  "enum"
-  "export"
-  "implements"
-  "interface"
-  "keyof"
-  "namespace"
-  "private"
-  "protected"
-  "public"
-  "type"
-  "readonly"
-  "override"
-  "satisfies"
-] @keyword
+; Types
+
+(type_identifier) @type
+(predefined_type) @type.builtin
+
+((identifier) @type
+ (#match? @type "^[A-Z]"))
+
+(type_arguments
+  "<" @punctuation.bracket
+  ">" @punctuation.bracket)
+
+; Variables
+
+(required_parameter (identifier) @variable.parameter)
+(optional_parameter (identifier) @variable.parameter)
+
+; Keywords
+
+[ "abstract"
+  "declare"
+  "enum"
+  "export"
+  "implements"
+  "interface"
+  "keyof"
+  "namespace"
+  "private"
+  "protected"
+  "public"
+  "type"
+  "readonly"
+  "override"
+  "satisfies"
+] @keyword

package/src/cli/tui/syntax/tree-sitter/yaml.highlights.scm

@@ -1,99 +1,99 @@
-(boolean_scalar) @boolean
-
-(null_scalar) @constant.builtin
-
-(double_quote_scalar) @string
-
-(single_quote_scalar) @string
-
-((block_scalar) @string
-  (#set! priority 99))
-
-(string_scalar) @string
-
-(escape_sequence) @string.escape
-
-(integer_scalar) @number
-
-(float_scalar) @number
-
-(comment) @comment @spell
-
-[
-  (anchor_name)
-  (alias_name)
-] @label
-
-(tag) @type
-
-[
-  (yaml_directive)
-  (tag_directive)
-  (reserved_directive)
-] @keyword.directive
-
-(block_mapping_pair
-  key: (flow_node
-    [
-      (double_quote_scalar)
-      (single_quote_scalar)
-    ] @property))
-
-(block_mapping_pair
-  key: (flow_node
-    (plain_scalar
-      (string_scalar) @property)))
-
-(flow_mapping
-  (_
-    key: (flow_node
-      [
-        (double_quote_scalar)
-        (single_quote_scalar)
-      ] @property)))
-
-(flow_mapping
-  (_
-    key: (flow_node
-      (plain_scalar
-        (string_scalar) @property))))
-
-[
-  ","
-  "-"
-  ":"
-  ">"
-  "?"
-  "|"
-] @punctuation.delimiter
-
-[
-  "["
-  "]"
-  "{"
-  "}"
-] @punctuation.bracket
-
-[
-  "*"
-  "&"
-  "---"
-  "..."
-] @punctuation.special
-
-; help deal with for yaml's norway problem https://www.bram.us/2022/01/11/yaml-the-norway-problem/
-; only using `true` and `false`, since Treesitter parser targets YAML spec 1.2 https://github.com/nvim-treesitter/nvim-treesitter/pull/7512#issuecomment-2565397302
-(block_mapping_pair
-  value: (block_node
-    (block_sequence
-      (block_sequence_item
-        (flow_node
-          (plain_scalar
-            (string_scalar) @boolean
-            (#any-of? @boolean "TRUE" "FALSE" "True" "False")))))))
-
-(block_mapping_pair
-  value: (flow_node
-    (plain_scalar
-      (string_scalar) @boolean
-      (#any-of? @boolean "TRUE" "FALSE" "True" "False"))))
+(boolean_scalar) @boolean
+
+(null_scalar) @constant.builtin
+
+(double_quote_scalar) @string
+
+(single_quote_scalar) @string
+
+((block_scalar) @string
+  (#set! priority 99))
+
+(string_scalar) @string
+
+(escape_sequence) @string.escape
+
+(integer_scalar) @number
+
+(float_scalar) @number
+
+(comment) @comment @spell
+
+[
+  (anchor_name)
+  (alias_name)
+] @label
+
+(tag) @type
+
+[
+  (yaml_directive)
+  (tag_directive)
+  (reserved_directive)
+] @keyword.directive
+
+(block_mapping_pair
+  key: (flow_node
+    [
+      (double_quote_scalar)
+      (single_quote_scalar)
+    ] @property))
+
+(block_mapping_pair
+  key: (flow_node
+    (plain_scalar
+      (string_scalar) @property)))
+
+(flow_mapping
+  (_
+    key: (flow_node
+      [
+        (double_quote_scalar)
+        (single_quote_scalar)
+      ] @property)))
+
+(flow_mapping
+  (_
+    key: (flow_node
+      (plain_scalar
+        (string_scalar) @property))))
+
+[
+  ","
+  "-"
+  ":"
+  ">"
+  "?"
+  "|"
+] @punctuation.delimiter
+
+[
+  "["
+  "]"
+  "{"
+  "}"
+] @punctuation.bracket
+
+[
+  "*"
+  "&"
+  "---"
+  "..."
+] @punctuation.special
+
+; help deal with for yaml's norway problem https://www.bram.us/2022/01/11/yaml-the-norway-problem/
+; only using `true` and `false`, since Treesitter parser targets YAML spec 1.2 https://github.com/nvim-treesitter/nvim-treesitter/pull/7512#issuecomment-2565397302
+(block_mapping_pair
+  value: (block_node
+    (block_sequence
+      (block_sequence_item
+        (flow_node
+          (plain_scalar
+            (string_scalar) @boolean
+            (#any-of? @boolean "TRUE" "FALSE" "True" "False")))))))
+
+(block_mapping_pair
+  value: (flow_node
+    (plain_scalar
+      (string_scalar) @boolean
+      (#any-of? @boolean "TRUE" "FALSE" "True" "False"))))

package/src/cli/tui/tool-rendering.mjs

@@ -1,87 +1,87 @@
-import { extractToolOutput } from "../tool-output.mjs";
-import { formatToolStartLine, formatToolSuccessSummary } from "../../agent/tool-summary.mjs";
-import { dim, red } from "./ui-theme.mjs";
-
-export { formatToolStartLine, formatToolSuccessSummary } from "../../agent/tool-summary.mjs";
-
-const TOOL_BODY_LIMIT = 40;
-const TOOL_ERROR_LIMIT = 6;
-
-export function writeToolStart({ output, name, args }) {
-  const block = createToolCardBlock({ name, args });
-  writeStructuredLines(output, block);
-  return block;
-}
-
-export function createToolCardBlock({ name, args }) {
-  return {
-    type: "tool-card",
-    name,
-    args,
-    title: formatToolStartLine(name, args),
-    state: "running",
-    isError: false,
-    summary: "running",
-    bodyLines: [],
-  };
-}
-
-export function writeToolEnd({
-  output,
-  name,
-  isError,
-  result,
-  toolsExpanded = false,
-  extractToolOutputImpl = extractToolOutput,
-  toolBlock = null,
-}) {
-  const card = formatToolEndCard({ name, isError, result, extractToolOutputImpl });
-  if (toolBlock?.type === "tool-card") {
-    Object.assign(toolBlock, card, { expanded: toolsExpanded });
-    return true;
-  }
-
-  const lines = renderToolEndFallbackLines({ name, card, toolsExpanded });
-  if (!lines.length) return false;
-  writeStructuredLines(output, { type: "tool", lines });
-  return true;
-}
-
-function formatToolEndCard({ name, isError, result, extractToolOutputImpl }) {
-  const out = extractToolOutputImpl(result);
-  if (isError) {
-    return {
-      state: "done",
-      isError: true,
-      summary: "failed",
-      bodyLines: out.split("\n").filter(Boolean).slice(0, TOOL_ERROR_LIMIT).map((line) => line.slice(0, 120)),
-    };
-  }
-
-  const summary = formatToolSuccessSummary(name, result, out) || "done";
-  return {
-    state: "done",
-    isError: false,
-    summary,
-    bodyLines: out ? out.split("\n").slice(0, TOOL_BODY_LIMIT).map((line) => line.slice(0, 120)) : [],
-  };
-}
-
-function renderToolEndFallbackLines({ name, card, toolsExpanded }) {
-  if (card.isError) {
-    return [
-      red(`  ◆ ${name} failed`),
-      ...card.bodyLines.map((line) => red(`    ${line}`)),
-    ];
-  }
-  if (!toolsExpanded) return card.summary && card.summary !== "done" ? [dim(`    ${card.summary}`)] : [];
-  return card.bodyLines.map((line) => dim(`    ${line}`));
-}
-
-function writeStructuredLines(output, block) {
-  if (typeof output.addBlock === "function") output.addBlock(block);
-  else {
-    const lines = block.lines ?? [dim(`  ${block.title}`)];
-    for (const line of lines) output.writeln(line);
-  }
-}
+import { extractToolOutput } from "../tool-output.mjs";
+import { formatToolStartLine, formatToolSuccessSummary } from "../../agent/tool-summary.mjs";
+import { dim, red } from "./ui-theme.mjs";
+
+export { formatToolStartLine, formatToolSuccessSummary } from "../../agent/tool-summary.mjs";
+
+const TOOL_BODY_LIMIT = 40;
+const TOOL_ERROR_LIMIT = 6;
+
+export function writeToolStart({ output, name, args }) {
+  const block = createToolCardBlock({ name, args });
+  writeStructuredLines(output, block);
+  return block;
+}
+
+export function createToolCardBlock({ name, args }) {
+  return {
+    type: "tool-card",
+    name,
+    args,
+    title: formatToolStartLine(name, args),
+    state: "running",
+    isError: false,
+    summary: "running",
+    bodyLines: [],
+  };
+}
+
+export function writeToolEnd({
+  output,
+  name,
+  isError,
+  result,
+  toolsExpanded = false,
+  extractToolOutputImpl = extractToolOutput,
+  toolBlock = null,
+}) {
+  const card = formatToolEndCard({ name, isError, result, extractToolOutputImpl });
+  if (toolBlock?.type === "tool-card") {
+    Object.assign(toolBlock, card, { expanded: toolsExpanded });
+    return true;
+  }
+
+  const lines = renderToolEndFallbackLines({ name, card, toolsExpanded });
+  if (!lines.length) return false;
+  writeStructuredLines(output, { type: "tool", lines });
+  return true;
+}
+
+function formatToolEndCard({ name, isError, result, extractToolOutputImpl }) {
+  const out = extractToolOutputImpl(result);
+  if (isError) {
+    return {
+      state: "done",
+      isError: true,
+      summary: "failed",
+      bodyLines: out.split("\n").filter(Boolean).slice(0, TOOL_ERROR_LIMIT).map((line) => line.slice(0, 120)),
+    };
+  }
+
+  const summary = formatToolSuccessSummary(name, result, out) || "done";
+  return {
+    state: "done",
+    isError: false,
+    summary,
+    bodyLines: out ? out.split("\n").slice(0, TOOL_BODY_LIMIT).map((line) => line.slice(0, 120)) : [],
+  };
+}
+
+function renderToolEndFallbackLines({ name, card, toolsExpanded }) {
+  if (card.isError) {
+    return [
+      red(`  ◆ ${name} failed`),
+      ...card.bodyLines.map((line) => red(`    ${line}`)),
+    ];
+  }
+  if (!toolsExpanded) return card.summary && card.summary !== "done" ? [dim(`    ${card.summary}`)] : [];
+  return card.bodyLines.map((line) => dim(`    ${line}`));
+}
+
+function writeStructuredLines(output, block) {
+  if (typeof output.addBlock === "function") output.addBlock(block);
+  else {
+    const lines = block.lines ?? [dim(`  ${block.title}`)];
+    for (const line of lines) output.writeln(line);
+  }
+}