farai 0.3.3 → 0.3.4

package/dist/cli/index.js

@@ -61,10 +61,11 @@ function isDefaultSessionTitle(value) {
   return !value?.trim() || DEFAULT_TITLES.has(value.trim().toLowerCase());
 }
 function normalizeSessionTitle(value, fallback = DEFAULT_SESSION_TITLE) {
-  const clean = value.replace(/<[^>]+>/g, " ").replace(/^\s*(?:[-*#>]+|\d+[.)])\s*/, "").replace(/\s+/g, " ").trim().replace(/[.!?,;:]+$/, "").trim();
+  const clean = value.replace(/<[^>]+>/g, " ").replace(/[`*_#>~|]+/g, " ").replace(/["'\u201C\u201D\u2018\u2019()\[\]{}]/g, " ").replace(/^\s*(?:[-*#>]+|\d+[.)])\s*/, "").replace(/[^\p{L}\p{N}\s.\/&+-]+/gu, " ").replace(/\s+/g, " ").trim().replace(/[.!?,;:\/&+-]+$/, "").trim().toLowerCase();
   if (!clean)
     return fallback;
-  return clean.length > 72 ? `${clean.slice(0, 69).trimEnd()}...` : clean;
+  const byWords = clean.split(" ").slice(0, TITLE_MAX_WORDS).join(" ");
+  return byWords.length > TITLE_MAX_CHARS ? byWords.slice(0, TITLE_MAX_CHARS).trimEnd() : byWords;
 }
 function titleFromPrompt(prompt, fallback = DEFAULT_SESSION_TITLE) {
   const first = prompt.split(`
@@ -73,12 +74,21 @@ function titleFromPrompt(prompt, fallback = DEFAULT_SESSION_TITLE) {
     return fallback;
   return normalizeSessionTitle(first.replace(LEADING_FILLER, ""), fallback);
 }
+function titleFromModelText(text, fallback = DEFAULT_SESSION_TITLE) {
+  const stripped = text.replace(/<think>[\s\S]*?<\/think>/gi, "").replace(/<[^>]+>/g, " ").replace(/^\s*title\s*[:\-]\s*/i, "");
+  const first = stripped.split(`
+`).map((line) => line.trim()).find(Boolean) ?? "";
+  return normalizeSessionTitle(first, fallback);
+}
 function sessionDisplayName(session) {
   if (isDefaultSessionTitle(session?.title))
     return DEFAULT_SESSION_TITLE;
   return normalizeSessionTitle(session.title, DEFAULT_SESSION_TITLE);
 }
-var DEFAULT_SESSION_TITLE = "new session", DEFAULT_TITLES, LOW_INFORMATION, LEADING_FILLER;
+var DEFAULT_SESSION_TITLE = "new session", DEFAULT_TITLES, LOW_INFORMATION, LEADING_FILLER, TITLE_MAX_WORDS = 6, TITLE_MAX_CHARS = 48, SESSION_TITLE_PROMPT = `Write a short title for this session, describing the user's overall task.
+Rules: 3 to 6 words, at most 48 characters, lowercase, plain text only.
+No quotes, no markdown, no emoji, no trailing punctuation, no prefixes like "title:".
+Be general about the whole task, not a single step. Respond with the title only.`;
 var init_session_title = __esm(() => {
   DEFAULT_TITLES = new Set(["new session", "untitled", "untitled session"]);
   LOW_INFORMATION = /^(?:hi|hey|hello|halo|hai|yo|bro|test|testing|ping|p|ok|oke|okay|sip|thanks|thank you|makasih|terima kasih)[.!?\s]*$/i;
@@ -8774,8 +8784,8 @@ var init_process_output = __esm(() => {
 
 // src/version.ts
 function resolveFaraiVersion() {
-  if ("0.3.3")
-    return "0.3.3";
+  if ("0.3.4")
+    return "0.3.4";
   try {
     const parsed = JSON.parse(readBoundedFileTextSync(new URL("../package.json", import.meta.url), 1024 * 1024, "package metadata"));
     if (typeof parsed.version === "string" && parsed.version)
@@ -29415,40 +29425,15 @@ function renderCtfNotes(input) {
 // src/agent-tools/tool-guidance.ts
 function modelToolDescription(tool, _detailed = false) {
   const exact = EXACT_GUIDANCE[tool.name];
-  const highValue = new Set(["report_add_finding", "cvss_calculate", "internet_search", "agent_spawn"]);
-  if (!exact || !_detailed && !highValue.has(tool.name))
+  if (!exact)
     return tool.description;
   return `${tool.description}
 
 model contract: ${exact}`;
 }
-function toolGuidanceMatchesQuery(toolName, query) {
-  const normalized = query.toLowerCase();
-  const terms = toolName.split("_").filter((term) => term.length >= 3);
-  const words = new Set(normalized.match(/[a-z0-9]+/g) ?? []);
-  const fileIntent = /\b(file|path|write|edit|patch|markdown|\.md|report)\b/.test(normalized);
-  const fileTools = ["fs_read", "fs_list", "fs_grep", "fs_write", "fs_edit", "patch_apply", "code_write_script", "report_add_finding", "report_update_finding"];
-  return terms.some((term) => words.has(term)) || fileIntent && fileTools.includes(toolName) || normalized.includes("finding") && ["report_add_finding", "report_update_finding", "campaign_verify", "campaign_test", "cvss_calculate"].includes(toolName) || normalized.includes("email") && toolName.startsWith("email_") || normalized.includes("browser") && toolName.startsWith("browser_") || normalized.includes("proxy") && toolName.startsWith("proxy_") || normalized.includes("campaign") && toolName.startsWith("campaign_");
-}
-function modelToolSchema(schema, detailed = false, toolName) {
-  if (!detailed && !new Set(["report_add_finding", "cvss_calculate", "internet_search", "agent_spawn"]).has(toolName ?? "")) {
-    return compactSchemaNode(schema);
-  }
+function modelToolSchema(schema, _detailed = false, toolName) {
   return enrichSchemaNode(schema, [], toolName);
 }
-function compactSchemaNode(value) {
-  if (Array.isArray(value))
-    return value.map(compactSchemaNode);
-  if (!isRecord9(value))
-    return value;
-  const compact = {};
-  for (const [key, child] of Object.entries(value)) {
-    if (key === "description")
-      continue;
-    compact[key] = compactSchemaNode(child);
-  }
-  return compact;
-}
 function enrichSchemaNode(value, path, toolName) {
   if (Array.isArray(value))
     return value.map((item) => enrichSchemaNode(item, path, toolName));
@@ -33048,22 +33033,17 @@ class HeuristicPlanner {
     });
   }
 }
-function buildToolsPayload(toolNames, availableTools, options = {}) {
+function buildToolsPayload(toolNames, availableTools, _options = {}) {
   const payload = [];
   const available = availableTools ? new Map(availableTools.map((tool) => [tool.name, tool])) : undefined;
-  let detailedCount = 0;
   for (const name of [...new Set(toolNames.map(canonicalToolName))].sort()) {
     const tool = available?.get(name) ?? getTool(name);
     if (!tool)
       continue;
-    const matched = Boolean(options.userText && toolGuidanceMatchesQuery(tool.name, options.userText));
-    const detailed = matched && (options.maxDetailedTools === undefined || detailedCount < options.maxDetailedTools);
-    if (detailed)
-      detailedCount += 1;
     payload.push({
       name: tool.name,
-      description: modelToolDescription(tool, detailed),
-      parameters: modelToolSchema(tool.inputSchema, detailed, tool.name)
+      description: modelToolDescription(tool),
+      parameters: modelToolSchema(tool.inputSchema, true, tool.name)
     });
   }
   return payload;
@@ -35377,10 +35357,7 @@ function mergeProviderToolCatalog(advertised, selected, availableTools) {
     const current = buildToolsPayload([definition.name], availableTools)[0];
     if (!current)
       continue;
-    const detailed = buildToolsPayload([definition.name], availableTools, {
-      userText: definition.name.replaceAll("_", " ")
-    })[0];
-    const isCurrent = sameProviderTool(prior, current) || (detailed ? sameProviderTool(prior, detailed) : false);
+    const isCurrent = sameProviderTool(prior, current);
     merged.push(isCurrent ? prior : selectedByName.get(prior.name) ?? current);
     seen.add(prior.name);
   }
@@ -37090,7 +37067,9 @@ function validateToolArgs(schema, args) {
   if (validate(args))
     return;
   const error = validate.errors?.[0];
-  return error ? formatValidationError(error, schema) : "arguments do not match the tool input schema";
+  if (!error)
+    return "arguments do not match the tool input schema";
+  return `${formatValidationError(error, schema)}${compositionShapes(error, schema)}`;
 }
 function compiledValidator(schema) {
   const cached = validatorCache.get(schema);
@@ -37151,6 +37130,58 @@ function formatValidationError(error, schema) {
       return `${fieldName(path)} ${error.message ?? `failed ${error.keyword} validation`}`;
   }
 }
+function compositionShapes(error, schema) {
+  const compositionPath = compositionPointer(error.schemaPath);
+  const branches = compositionPath ? resolveSchemaPointer(schema, compositionPath) : undefined;
+  if (!Array.isArray(branches) || branches.length < 2)
+    return "";
+  const shapes = branches.map(describeBranch).filter((text2) => Boolean(text2));
+  if (shapes.length < 2)
+    return "";
+  return `; provide exactly one shape: ${shapes.map((text2, index) => `${index + 1}) ${text2}`).join(" or ")}`;
+}
+function compositionPointer(schemaPath) {
+  if (typeof schemaPath !== "string")
+    return;
+  const segments = schemaPath.split("/");
+  for (let index = segments.length - 1;index >= 0; index -= 1) {
+    if (segments[index] === "oneOf" || segments[index] === "anyOf") {
+      return segments.slice(0, index + 1).join("/");
+    }
+  }
+  return;
+}
+function describeBranch(branch) {
+  if (!branch || typeof branch !== "object" || Array.isArray(branch))
+    return;
+  const record3 = branch;
+  const required = Array.isArray(record3.required) ? record3.required.map(String) : [];
+  if (required.length > 0)
+    return `{ ${required.join(", ")} }`;
+  if (typeof record3.type === "string")
+    return `a ${record3.type}`;
+  if (typeof record3.const !== "undefined")
+    return JSON.stringify(record3.const);
+  return;
+}
+function resolveSchemaPointer(schema, schemaPath) {
+  if (typeof schemaPath !== "string")
+    return;
+  const pointer = schemaPath.startsWith("#") ? schemaPath.slice(1) : schemaPath;
+  let node = schema;
+  for (const raw of pointer.split("/")) {
+    if (!raw)
+      continue;
+    const key = raw.replace(/~1/g, "/").replace(/~0/g, "~");
+    if (Array.isArray(node))
+      node = node[Number(key)];
+    else if (node && typeof node === "object")
+      node = node[key];
+    else
+      return;
+  }
+  return node;
+}
 function unexpectedFieldError(path, property, schema) {
   const field = joinFieldPath(path, property);
   const enumOwner = enumOwnerForValue(schema, property);
@@ -38068,6 +38099,7 @@ class AgentRuntime {
     this.maxTurnMs = resolveMaxTurnMs(options.maxTurnSeconds ?? config.maxTurnSeconds);
     this.maxCostUsd = positiveFinite(options.maxCostUsd ?? config.maxCostUsd);
     this.maxInputTokens = positiveFinite(options.maxInputTokens);
+    this.sessionTitlesEnabled = options.enableSessionTitles === true;
     this.mailbox = new SessionMailbox(this.store, this.runtimeId);
     this.inputQueue = new SessionInputQueue(this.mailbox, (sessionId, type, payload) => this.event(sessionId, type, payload));
     this.userInputs = new SessionUserInputCoordinator({
@@ -39369,6 +39401,7 @@ class AgentRuntime {
     const activeCampaignRun = source === "user" && !trimmed.startsWith("/") && !trimmed.startsWith("!") ? this.campaignSupervisor.prepare(session.id, input) : undefined;
     if (activeCampaignRun)
       session = this.store.loadSession(session.id);
+    let autoTitleBaseline;
     if (source === "user" && isDefaultSessionTitle(session.title)) {
       const title = titleFromPrompt(input);
       if (!isDefaultSessionTitle(title)) {
@@ -39377,6 +39410,7 @@ class AgentRuntime {
         });
         this.recordSession(session);
       }
+      autoTitleBaseline = session.title ?? DEFAULT_SESSION_TITLE;
     }
     if (source === "user" && (trimmed === "/compact" || trimmed.startsWith("/compact "))) {
       const cursor2 = this.store.latestEventSequence(session.id);
@@ -39480,6 +39514,11 @@ class AgentRuntime {
     if (source === "user" && !this.shuttingDown && this.store.loadTurn(turn.id).status !== "cancelled") {
       this.mailboxDispatcher.wakeQueuedInputs(session.id);
     }
+    if (autoTitleBaseline !== undefined && this.sessionTitlesEnabled && !trimmed.startsWith("/") && !trimmed.startsWith("!") && this.store.loadTurn(turn.id).status === "completed") {
+      this.generateSessionTitle(session.id, input, response, autoTitleBaseline).catch(() => {
+        return;
+      });
+    }
     const cursor = startedEvents.at(-1)?.sequence ?? 0;
     return {
       session,
@@ -39487,6 +39526,48 @@ class AgentRuntime {
       events: this.store.listEventsAfter(session.id, cursor, 1e4)
     };
   }
+  async generateSessionTitle(sessionId, userText, assistantText, baseline) {
+    let session = this.store.loadSession(sessionId);
+    if (session.title !== baseline)
+      return;
+    let planner;
+    if (this.planner)
+      planner = this.planner;
+    else
+      planner = new ChatProviderPlanner(this.chatProviderOverride ?? await createChatProviderForSession(session, this.workspace));
+    if (planner.compactionMode !== "model")
+      return;
+    const history = [{
+      role: "user",
+      text: userText.slice(0, 4000)
+    }];
+    const reply = sanitizeVisibleResponse(assistantText).trim();
+    if (reply)
+      history.push({
+        role: "assistant",
+        text: reply.slice(0, 4000)
+      });
+    const actions = await planner.plan({
+      session,
+      userText: "title",
+      systemInstruction: SESSION_TITLE_PROMPT,
+      history,
+      tools: [],
+      toolCatalog: [],
+      toolChoice: "none"
+    });
+    const text2 = actions.filter((action) => action.kind === "respond").map((action) => action.text).join(" ");
+    const title = titleFromModelText(text2, "");
+    if (!title)
+      return;
+    session = this.store.loadSession(sessionId);
+    if (session.title !== baseline)
+      return;
+    session = this.store.updateSession(sessionId, {
+      title
+    });
+    this.recordSession(session);
+  }
   async runAgentLoop(session, turn, contextMessage, assistantMessage, input, userAuthored = true, mailboxItems = []) {
     const responses = [];
     let planner;
@@ -66289,9 +66370,10 @@ function StatusIndicator(props) {
     const value = tui.store.ui.statusDetail;
     return value && value !== "working" && value !== props.activity && !isFooterStatusDetail(value) ? ` \u2022 ${value}` : "";
   };
+  const glyph = () => SPINNER_FRAMES[(props.spinnerFrame ?? 0) % SPINNER_FRAMES.length];
   const text2 = () => {
     if (props.activity) {
-      const value2 = dims().width >= 56 ? `\u2022 ${props.activity} (${fmtElapsed(props.elapsed)}${detail()} \u2022 esc to interrupt)` : `\u2022 ${props.activity} ${fmtElapsed(props.elapsed)} \xB7 esc interrupt`;
+      const value2 = dims().width >= 56 ? `${glyph()} ${props.activity} (${fmtElapsed(props.elapsed)}${detail()} \u2022 esc to interrupt)` : `${glyph()} ${props.activity} ${fmtElapsed(props.elapsed)} \xB7 esc interrupt`;
       return truncateLine2(value2.toLowerCase(), Math.max(1, dims().width));
     }
     const value = tui.store.ui.statusDetail;
@@ -66310,6 +66392,7 @@ function StatusIndicator(props) {
     return _el$;
   })();
 }
+var SPINNER_FRAMES;
 var init_status_indicator = __esm(() => {
   init_solid2();
   init_solid2();
@@ -66321,6 +66404,7 @@ var init_status_indicator = __esm(() => {
   init_terminal();
   init_theme();
   init_footer_state();
+  SPINNER_FRAMES = ["\xB7", "\u2022", "\xB7"];
 });
 
 // src/agent-tui/dialog/list-selection.ts
@@ -69476,7 +69560,9 @@ function BottomPane() {
   const dims = useTuiDimensions();
   const commandRegistryRevision = useCommandRegistryRevision();
   const [elapsed, setElapsed] = createSignal(0);
+  const [spinner, setSpinner] = createSignal(0);
   let tick;
+  let spinTick;
   const frame = () => tui.store.ui.overlayStack.at(-1);
   const listFrame = () => {
     const top = frame();
@@ -69552,16 +69638,24 @@ function BottomPane() {
       clearInterval(tick);
       tick = undefined;
     }
+    if (spinTick) {
+      clearInterval(spinTick);
+      spinTick = undefined;
+    }
     if (!started) {
       setElapsed(0);
+      setSpinner(0);
       return;
     }
     setElapsed(Math.max(0, Math.floor((Date.now() - started) / 1000)));
     tick = setInterval(() => setElapsed(Math.max(0, Math.floor((Date.now() - started) / 1000))), 1000);
+    spinTick = setInterval(() => setSpinner((value) => value + 1), 120);
   });
   onCleanup(() => {
     if (tick)
       clearInterval(tick);
+    if (spinTick)
+      clearInterval(spinTick);
   });
   return (() => {
     var _el$ = createElement("box");
@@ -69579,6 +69673,9 @@ function BottomPane() {
           get elapsed() {
             return elapsed();
           },
+          get spinnerFrame() {
+            return spinner();
+          },
           get activity() {
             return statusActivity();
           }
@@ -70750,7 +70847,9 @@ async function launchOpenTui(workspace, sessionId) {
   const located = sessionId ? resolveSessionLocation(sessionId) : undefined;
   const effectiveWorkspace = located?.workspace ?? workspace;
   const effectiveSessionId = located?.id ?? sessionId;
-  const runtime = new AgentRuntime(effectiveWorkspace);
+  const runtime = new AgentRuntime(effectiveWorkspace, undefined, {
+    enableSessionTitles: true
+  });
   let port;
   try {
     await runtime.recover();
@@ -74303,5 +74402,5 @@ Examples:
 `);
 }
 
-//# debugId=11DF5F38873B6FC764756E2164756E21
+//# debugId=32EC65247FDE45AE64756E2164756E21
 //# sourceMappingURL=index.js.map