ummaya 0.2.4 → 0.2.6

package/tui/src/utils/claudeDesktop.ts

@@ -15,7 +15,7 @@ export async function getClaudeDesktopConfigPath(): Promise<string> {
 
   if (!SUPPORTED_PLATFORMS.includes(platform)) {
     throw new Error(
-      `Unsupported platform: ${platform} - Claude Desktop integration only works on macOS and WSL.`,
+      `Unsupported platform: ${platform} - desktop MCP config import only works on macOS and WSL.`,
     )
   }
 
@@ -56,7 +56,7 @@ export async function getClaudeDesktopConfigPath(): Promise<string> {
     try {
       const userDirs = await readdir(usersDir, { withFileTypes: true })
 
-      // Look for Claude Desktop config in each user directory
+      // Look for the desktop MCP config in each user directory
       for (const user of userDirs) {
         if (
           user.name === 'Public' ||
@@ -91,7 +91,7 @@ export async function getClaudeDesktopConfigPath(): Promise<string> {
   }
 
   throw new Error(
-    'Could not find Claude Desktop config file in Windows. Make sure Claude Desktop is installed on Windows.',
+    'Could not find a desktop MCP config file in Windows.',
   )
 }
 
@@ -100,7 +100,7 @@ export async function readClaudeDesktopMcpServers(): Promise<
 > {
   if (!SUPPORTED_PLATFORMS.includes(getPlatform())) {
     throw new Error(
-      'Unsupported platform - Claude Desktop integration only works on macOS and WSL.',
+      'Unsupported platform - desktop MCP config import only works on macOS and WSL.',
     )
   }
   try {

package/tui/src/utils/collapseReadSearch.ts

@@ -54,7 +54,7 @@ export type SearchOrReadResult = {
   isMemoryWrite: boolean
   /**
    * True for meta-operations that should be absorbed into a collapse group
-   * without incrementing any count (Snip, ToolSearch). They remain visible
+   * without incrementing the count (Snip, ToolSearch). They remain visible
    * in verbose mode via the groupMessages iteration.
    */
   isAbsorbedSilently: boolean
@@ -212,7 +212,7 @@ export function getToolSearchOrReadInfo(
   }
   // The tool's isSearchOrReadCommand method handles its own input validation via safeParse,
   // so passing the raw input is safe. The type assertion is necessary because Tool[] uses
-  // the default generic which expects { [x: string]: any }, but we receive unknown at runtime.
+  // the default generic expects a loose record, but we receive unknown at runtime.
   const result = tool.isSearchOrReadCommand(
     toolInput as { [x: string]: unknown },
   )
@@ -481,7 +481,7 @@ export function getToolUseIdsFromCollapsedGroup(
 }
 
 /**
- * Check if any tool in a collapsed group is in progress.
+ * Check if a tool in a collapsed group is in progress.
  */
 export function hasAnyToolInProgress(
   message: CollapsedReadSearchGroup,

package/tui/src/utils/cronTasks.ts

@@ -140,7 +140,7 @@ export async function readCronTasks(dir?: string): Promise<CronTask[]> {
 }
 
 /**
- * Sync check for whether the cron file has any valid tasks. Used by
+ * Sync check for whether the cron file includes valid tasks. Used by
  * cronScheduler.start() to decide whether to auto-enable. One file read.
  */
 export function hasCronTasksSync(dir?: string): boolean {

package/tui/src/utils/execFileNoThrow.ts

@@ -109,7 +109,7 @@ export function execFileNoThrowWithCwd(
     // Use execa for cross-platform .bat/.cmd compatibility on Windows
     execa(file, args, {
       maxBuffer,
-      signal: abortSignal,
+      cancelSignal: abortSignal,
       timeout: finalTimeout,
       cwd: finalCwd,
       env: finalEnv,

package/tui/src/utils/filePersistence/types.ts

@@ -1,44 +1,22 @@
 // [P0 reconstructed · rebuild-stubs.ts · symbol-complete stub]
 // Aggregated from every consumer import across src/.
-/* eslint-disable @typescript-eslint/no-explicit-any */
+import { createStub } from '../../stubs/any-stub'
 
-const __noop = (..._args: unknown[]): any => undefined as any;
-const __stub: any = new Proxy(function () {} as any, {
-  get(_t, p) {
-    if (p === Symbol.toPrimitive) return () => ""
-    if (p === Symbol.iterator) return function* () {}
-    if (p === Symbol.asyncIterator) return async function* () {}
-    if (p === Symbol.toStringTag) return "Stub"
-    if (p === Symbol.for("nodejs.util.inspect.custom")) return () => "<Stub>"
-    if (p === "inspect") return () => "<Stub>"
-    if (p === "then") return undefined
-    if (p === "toString") return () => ""
-    if (p === "valueOf") return () => undefined
-    if (p === "toJSON") return () => null
-    if (p === "length") return 0
-    if (p === "name") return "Stub"
-    if (p === "message") return ""
-    if (p === "stack") return ""
-    if (p === "constructor") return Object
-    return __stub
-  },
-  apply() { return __stub },
-  construct() { return __stub },
-});
+const __stub = createStub()
 
-export type DEFAULT_UPLOAD_CONCURRENCY = any;
-export const DEFAULT_UPLOAD_CONCURRENCY: any = __stub;
-export type FILE_COUNT_LIMIT = any;
-export const FILE_COUNT_LIMIT: any = __stub;
-export type FailedPersistence = any;
-export const FailedPersistence: any = __stub;
-export type FilesPersistedEventData = any;
-export const FilesPersistedEventData: any = __stub;
-export type OUTPUTS_SUBDIR = any;
-export const OUTPUTS_SUBDIR: any = __stub;
-export type PersistedFile = any;
-export const PersistedFile: any = __stub;
-export type TurnStartTime = any;
-export const TurnStartTime: any = __stub;
+export type DEFAULT_UPLOAD_CONCURRENCY = unknown;
+export const DEFAULT_UPLOAD_CONCURRENCY = __stub;
+export type FILE_COUNT_LIMIT = unknown;
+export const FILE_COUNT_LIMIT = __stub;
+export type FailedPersistence = unknown;
+export const FailedPersistence = __stub;
+export type FilesPersistedEventData = unknown;
+export const FilesPersistedEventData = __stub;
+export type OUTPUTS_SUBDIR = unknown;
+export const OUTPUTS_SUBDIR = __stub;
+export type PersistedFile = unknown;
+export const PersistedFile = __stub;
+export type TurnStartTime = unknown;
+export const TurnStartTime = __stub;
 
 export default __stub;

package/tui/src/utils/forkedAgent.ts

@@ -18,7 +18,7 @@ import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS,
   logEvent,
 } from '../services/analytics/index.js'
-import { accumulateUsage, updateUsage } from '../services/api/claude.js'
+import { accumulateUsage, updateUsage } from '../services/api/ummaya.js'
 import { EMPTY_USAGE, type NonNullableUsage } from '../services/api/logging.js'
 import type { ToolUseContext } from '../Tool.js'
 import type { AgentDefinition } from '../tools/AgentTool/loadAgentsDir.js'

package/tui/src/utils/gracefulShutdown.ts

@@ -197,7 +197,7 @@ function forceExit(exitCode: number): never {
     failsafeTimer = undefined
   }
   // Drain stdin LAST, right before exit. cleanupTerminalModes() sent
-  // DISABLE_MOUSE_TRACKING early, but the terminal round-trip plus any
+  // DISABLE_MOUSE_TRACKING early, but the terminal round-trip plus queued
   // events already in flight means bytes can arrive during the seconds
   // of async cleanup between then and now. Draining here catches them.
   // Use the Ink class method (not the standalone drainStdin()) so we
@@ -240,7 +240,7 @@ export const setupGracefulShutdown = memoize(() => {
   // the signal then falls back to its default action (terminate) and our
   // process.on('SIGTERM') handler never runs.
   //
-  // Trigger: any short-lived signal-exit v4 subscriber (e.g. execa per child
+  // Trigger: a short-lived signal-exit v4 subscriber (e.g. execa per child
   // process, or an Ink instance that unmounts). When its unsubscribe runs and
   // it was the last v4 subscriber, v4.unload() calls removeListener on every
   // signal in its list (SIGTERM, SIGINT, SIGHUP, …), tripping the Bun bug and
@@ -380,7 +380,7 @@ export function resetShutdownState(): void {
 }
 
 /**
- * Returns the in-flight shutdown promise, if any. Only for use in tests
+ * Returns the in-flight shutdown promise when present. Only for use in tests
  * to await completion before restoring mocks.
  */
 export function getPendingShutdownForTesting(): Promise<void> | undefined {
@@ -428,7 +428,7 @@ export async function gracefulShutdown(
   // Set the exit code that will be used when process naturally exits
   process.exitCode = exitCode
 
-  // Exit alt screen and print resume hint FIRST, before any async operations.
+  // Exit alt screen and print resume hint FIRST, before async operations.
   // This ensures the hint is visible even if the process is killed during
   // cleanup (e.g., SIGKILL during macOS reboot). Without this, the resume
   // hint would only appear after cleanup functions, hooks, and analytics

package/tui/src/utils/heapDumpService.ts

@@ -22,6 +22,15 @@ import { getFsImplementation } from './fsOperations.js'
 import { logError } from './log.js'
 import { jsonStringify } from './slowOperations.js'
 
+declare global {
+  namespace NodeJS {
+    interface Process {
+      _getActiveHandles(): unknown[]
+      _getActiveRequests(): unknown[]
+    }
+  }
+}
+
 export type HeapDumpResult = {
   success: boolean
   heapPath?: string
@@ -103,12 +112,8 @@ export async function captureMemoryDiagnostics(
   }
 
   // Get active handles/requests count (these are internal APIs but stable)
-  const activeHandles = (
-    process as unknown as { _getActiveHandles: () => unknown[] }
-  )._getActiveHandles().length
-  const activeRequests = (
-    process as unknown as { _getActiveRequests: () => unknown[] }
-  )._getActiveRequests().length
+  const activeHandles = process._getActiveHandles().length
+  const activeRequests = process._getActiveRequests().length
 
   // Try to count open file descriptors (Linux/macOS)
   let openFileDescriptors: number | undefined
@@ -287,8 +292,7 @@ async function writeHeapSnapshot(filepath: string): Promise<void> {
     // Use synchronous I/O despite potentially large filesize so that we avoid cloning the string for cross-thread usage.
     //
     /* eslint-disable custom-rules/no-sync-fs -- intentionally sync to avoid cloning large heap snapshot string for cross-thread usage */
-    // @ts-expect-error 2nd argument is in the next version of Bun
-    writeFileSync(filepath, Bun.generateHeapSnapshot('v8', 'arraybuffer'), {
+    writeFileSync(filepath, new Uint8Array(Bun.generateHeapSnapshot('v8', 'arraybuffer')), {
       mode: 0o600,
     })
     /* eslint-enable custom-rules/no-sync-fs */

package/tui/src/utils/hooks/apiQueryHookHelper.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto'
 import type { QuerySource } from '../../constants/querySource.js'
-import { queryModelWithoutStreaming } from '../../services/api/claude.js'
+import { queryModelWithoutStreaming } from '../../services/api/ummaya.js'
 import type { Message } from '../../types/message.js'
 import { createAbortController } from '../../utils/abortController.js'
 import { logError } from '../../utils/log.js'

package/tui/src/utils/hooks/execPromptHook.ts

@@ -1,6 +1,6 @@
 import { randomUUID } from 'crypto'
 import type { HookEvent } from 'src/entrypoints/agentSdkTypes.js'
-import { queryModelWithoutStreaming } from '../../services/api/claude.js'
+import { queryModelWithoutStreaming } from '../../services/api/ummaya.js'
 import type { ToolUseContext } from '../../Tool.js'
 import type { Message } from '../../types/message.js'
 import { createAttachmentMessage } from '../attachments.js'

package/tui/src/utils/hooks/skillImprovement.ts

@@ -6,7 +6,7 @@ import {
   type AnalyticsMetadata_I_VERIFIED_THIS_IS_PII_TAGGED,
   logEvent,
 } from '../../services/analytics/index.js'
-import { queryModelWithoutStreaming } from '../../services/api/claude.js'
+import { queryModelWithoutStreaming } from '../../services/api/ummaya.js'
 import { getEmptyToolPermissionContext } from '../../Tool.js'
 import type { Message } from '../../types/message.js'
 import { createAbortController } from '../abortController.js'

package/tui/src/utils/mcp/dateTimeParser.ts

@@ -1,4 +1,4 @@
-import { queryHaiku } from '../../services/api/claude.js'
+import { queryHaiku } from '../../services/api/ummaya.js'
 import { logError } from '../log.js'
 import { extractTextContent } from '../messages.js'
 import { asSystemPrompt } from '../systemPromptType.js'

package/tui/src/utils/messages.ts

@@ -432,6 +432,24 @@ export function createAssistantMessage({
   })
 }
 
+export function finalizeStreamingAssistantMessage(params: {
+  readonly messages: readonly Message[]
+  readonly streamingText: string | null
+  readonly turnStartMessageCount: number
+}): readonly Message[] {
+  const { messages, streamingText, turnStartMessageCount } = params
+  if (streamingText === null || streamingText.trim() === '') {
+    return messages
+  }
+
+  const turnMessages = messages.slice(turnStartMessageCount)
+  if (turnMessages.some(message => message.type === 'assistant')) {
+    return messages
+  }
+
+  return [...messages, createAssistantMessage({ content: streamingText })]
+}
+
 export function createAssistantAPIErrorMessage({
   content,
   apiError,

package/tui/src/utils/migrateSessions.ts

@@ -15,7 +15,7 @@
 //   - copyFile(src, dest, COPYFILE_EXCL) — fails if dest already exists;
 //     skips rather than overwriting.
 //   - fsync(dest fd) — durability before unlink.
-//   - --prune: any error during unlink phase throws + aborts (no partial-prune).
+//   - --prune: an unlink-phase error throws + aborts (no partial-prune).
 //   - src JSONL never truncated: if copyFile throws, src is untouched.
 //
 // Zero new runtime dependencies (AGENTS.md hard rule).
@@ -33,7 +33,7 @@ import { getUmmayaSessionsDir } from './ummayaPaths.js'
 export interface MigrateSessionsOpts {
   /**
    * When true, unlink each successfully copied source file after fsync.
-   * If any unlink fails, the entire prune phase aborts and throws — no
+   * If an unlink fails, the entire prune phase aborts and throws — no
    * partial-prune state is left.
    */
   prune?: boolean
@@ -248,7 +248,7 @@ export async function migrateSessions(
   }
 
   // --- Prune phase (only runs when prune: true) ---
-  // Invariant: any unlink failure aborts the entire prune phase and throws.
+  // Invariant: unlink failure aborts the entire prune phase and throws.
   // This prevents partial-prune state.
   if (prune && copied.length > 0) {
     for (const src of copied) {

package/tui/src/utils/model/model.ts

@@ -1,5 +1,5 @@
 // UMMAYA Epic #2112: legacy model-dispatch matrix removed; collapsed to K-EXAONE single branch.
-// Public function signatures preserved per FR-006 caller-reach rule (callers in services/api/claude.ts,
+// Public function signatures preserved per FR-006 caller-reach rule (callers in services/api/ummaya.ts,
 // memdir/findRelevantMemories.ts, utils/attachments.ts, commands/insights.ts, services/tokenEstimation.ts,
 // components/messages/AssistantTextMessage.tsx are bucket B — kept alive until P2 issue #2147 lands).
 //
@@ -77,19 +77,19 @@ export function getBestModel(): ModelName {
   return getDefaultMainLoopModel()
 }
 
-// [Deferred to P2 — issue #2147]: thin alias preserved for services/api/claude.ts
-// import-graph stability. Removed together with services/api/claude.ts in Phase P2.
+// [Deferred to P2 — issue #2147]: thin alias preserved for services/api/ummaya.ts
+// import-graph stability. Removed together with services/api/ummaya.ts in Phase P2.
 export function getDefaultOpusModel(): ModelName {
   return getDefaultMainLoopModel()
 }
 
-// [Deferred to P2 — issue #2147]: thin alias preserved for services/api/claude.ts
+// [Deferred to P2 — issue #2147]: thin alias preserved for services/api/ummaya.ts
 // import-graph stability.
 export function getDefaultSonnetModel(): ModelName {
   return getDefaultMainLoopModel()
 }
 
-// [Deferred to P2 — issue #2147]: thin alias preserved for services/api/claude.ts
+// [Deferred to P2 — issue #2147]: thin alias preserved for services/api/ummaya.ts
 // import-graph stability.
 export function getDefaultHaikuModel(): ModelName {
   return getDefaultMainLoopModel()
@@ -130,7 +130,7 @@ export function getDefaultMainLoopModel(): ModelName {
  * fail-safe single branch keyed on K-EXAONE detection.
  *
  * [Deferred to P2 — issue #2147]: this function is preserved as an export for
- * services/api/claude.ts callers; removed together with that file in Phase P2.
+ * services/api/ummaya.ts callers; removed together with that file in Phase P2.
  */
 export function firstPartyNameToCanonical(name: ModelName): ModelShortName {
   const lowered = name.toLowerCase()

package/tui/src/utils/permissions/yoloClassifier.ts

@@ -13,7 +13,7 @@ import {
 import { getFeatureValue_CACHED_MAY_BE_STALE } from '../../services/analytics/growthbook.js'
 import { logEvent } from '../../services/analytics/index.js'
 import type { AnalyticsMetadata_I_VERIFIED_THIS_IS_NOT_CODE_OR_FILEPATHS } from '../../services/analytics/metadata.js'
-import { getCacheControl } from '../../services/api/claude.js'
+import { getCacheControl } from '../../services/api/ummaya.js'
 import { parsePromptTooLongTokenCounts } from '../../services/api/errors.js'
 import { getDefaultMaxRetries } from '../../services/api/withRetry.js'
 import type { Tool, ToolPermissionContext, Tools } from '../../Tool.js'

package/tui/src/utils/plugins/headlessPluginInstall.ts

@@ -69,7 +69,7 @@ export async function installPluginsForHeadless(): Promise<boolean> {
 
   // Declared now includes an implicit claude-plugins-official entry when any
   // enabled plugin references it (see getDeclaredMarketplaces). This routes
-  // the official marketplace through the same reconciler path as any other —
+  // the official marketplace through the same reconciler path as the others —
   // which composes correctly with CLAUDE_CODE_PLUGIN_SEED_DIR: seed registers
   // it in known_marketplaces.json, reconciler diff sees it as upToDate, no clone.
   const declaredCount = Object.keys(getDeclaredMarketplaces()).length

package/tui/src/utils/plugins/mcpPluginIntegration.ts

@@ -434,7 +434,7 @@ export async function extractMcpServersFromPlugins(
  * config (assistant-mode channels). Channel-specific wins on collision so
  * plugins that declare the same key at both levels get the more specific value.
  *
- * Returns undefined when neither source has anything — resolvePluginMcpEnvironment
+ * Returns undefined when neither source provides values — resolvePluginMcpEnvironment
  * skips substituteUserConfigVariables in that case.
  */
 function buildMcpUserConfig(

package/tui/src/utils/plugins/mcpbHandler.ts

@@ -132,7 +132,7 @@ function serverSecretsKey(pluginId: string, serverName: string): string {
  * collision shouldn't happen, but if a user hand-edits settings.json we
  * trust the more secure source.
  *
- * Returns null only if NEITHER source has anything — callers skip
+ * Returns null only if NEITHER source provides values — callers skip
  * ${user_config.X} substitution in that case.
  *
  * @param pluginId - Plugin identifier in "plugin@marketplace" format

package/tui/src/utils/plugins/pluginLoader.ts

@@ -680,7 +680,7 @@ async function installFromGitHub(
 /**
  * Resolve a git-subdir `url` field to a clonable git URL.
  * Accepts GitHub owner/repo shorthand (converted to ssh or https depending on
- * CLAUDE_CODE_REMOTE) or any URL that passes validateGitUrl (https, http,
+ * CLAUDE_CODE_REMOTE) or a URL that passes validateGitUrl (https, http,
  * file, git@ ssh).
  */
 function resolveGitSubdirUrl(url: string): string {
@@ -1335,7 +1335,7 @@ async function validatePluginPaths(
  * - Hooks: Loads from hooks/hooks.json if present
  *
  * The function is tolerant of missing components - a plugin can have
- * any combination of the above directories/files. Missing component files
+ * whichever combination of the above directories/files exists. Missing component files
  * are reported as errors but don't prevent plugin loading.
  *
  * @param pluginPath - Absolute path to the plugin directory
@@ -1343,7 +1343,7 @@ async function validatePluginPaths(
  * @param enabled - Initial enabled state (may be overridden by settings)
  * @param fallbackName - Name to use if manifest doesn't specify one
  * @param strict - When true, adds errors for duplicate hook files (default: true)
- * @returns Object containing the LoadedPlugin and any errors encountered
+ * @returns Object containing the LoadedPlugin and errors encountered
  */
 export async function createPluginFromPath(
   pluginPath: string,
@@ -1464,7 +1464,7 @@ export async function createPluginFromPath(
       if (validPaths.length > 0) {
         plugin.commandsPaths = validPaths
       }
-      // Set commandsMetadata if there are any commands (file-based or inline)
+      // Set commandsMetadata when commands exist (file-based or inline)
       if (Object.keys(commandsMetadata).length > 0) {
         plugin.commandsMetadata = commandsMetadata
       }
@@ -1928,7 +1928,7 @@ async function loadPluginsFromMarketplaces({
   // loads the plugin unchecked — a silent fail-open. This guard restores
   // fail-closed: unknown source + active policy → block.
   //
-  // Allowlist: any value (including []) is active — empty allowlist = deny all.
+  // Allowlist: a configured value (including []) is active — empty allowlist = deny all.
   // Blocklist: empty [] is a semantic no-op — only non-empty counts as active.
   const strictAllowlist = getStrictKnownMarketplaces()
   const blocklist = getBlockedMarketplaces()
@@ -2185,7 +2185,7 @@ async function loadPluginFromMarketplaceEntryCacheOnly(
  *   omits `version`. Avoids re-cloning external plugins just to discover the
  *   version we already recorded at install time.
  *
- * Returns both the loaded plugin and any errors encountered during loading.
+ * Returns both the loaded plugin and errors encountered during loading.
  * Errors include missing component files and hook load failures.
  */
 async function loadPluginFromMarketplaceEntry(
@@ -2923,7 +2923,7 @@ async function finishLoadingPluginFromPath(
  * They appear with source='plugin-name@inline' and are always enabled for the current session.
  *
  * @param sessionPluginPaths - Array of plugin directory paths from CLI
- * @returns LoadedPlugin objects and any errors encountered
+ * @returns LoadedPlugin objects and encountered errors
  */
 async function loadSessionOnlyPlugins(
   sessionPluginPaths: Array<string>,
@@ -3056,7 +3056,7 @@ export function mergePluginSources(sources: {
   })
   // Session first, then non-overridden marketplace, then builtin.
   // Downstream first-match consumers see session plugins before
-  // installed ones for any that slipped past the name filter.
+  // installed ones for entries that slipped past the name filter.
   return {
     plugins: [...sessionPlugins, ...marketplacePlugins, ...sources.builtin],
     errors,

package/tui/src/utils/protectedNamespace.ts

@@ -4,6 +4,8 @@
 // CC consumer references (envUtils.ts:142) imply CC has runtime equivalents but they're
 // not in restored-src — UMMAYA NO-OP is justified until TUI Fidelity Meta-Epic
 // decides on UMMAYA-original implementation.
-const __stub: any = undefined
-export default __stub
-export {}
+export function checkProtectedNamespace(): boolean {
+  return false
+}
+
+export default checkProtectedNamespace