ummaya 0.2.0 → 0.2.2

package/bin/ummaya

@@ -7,9 +7,27 @@ import { delimiter, dirname, join } from 'node:path'
 import { fileURLToPath } from 'node:url'
 
 const MINIMUM_BUN_VERSION = '1.3.0'
-const launcherPath = realpathSync(fileURLToPath(import.meta.url))
+const PACKAGED_PRIMITIVE_TIMEOUT_MS = '90000'
 
-function bunVersionAtLeast(version, minimum) {
+function currentLauncherPath() {
+  return realpathSync(fileURLToPath(import.meta.url))
+}
+
+function invokedLauncherPath() {
+  const argvPath = process.argv[1]
+  if (!argvPath) return null
+  try {
+    return realpathSync(argvPath)
+  } catch {
+    return null
+  }
+}
+
+function isDirectLaunch() {
+  return invokedLauncherPath() === currentLauncherPath()
+}
+
+export function bunVersionAtLeast(version, minimum) {
   const current = String(version)
     .split('.')
     .map((part) => Number.parseInt(part, 10))
@@ -62,7 +80,7 @@ function probeBunVersion(candidate) {
   return (result.stdout || result.stderr).trim()
 }
 
-function launchWithCompatibleBun(currentVersion = null) {
+function launchWithCompatibleBun(launcherPath, currentVersion = null) {
   const checked = []
   for (const candidate of collectBunCandidates()) {
     const version = probeBunVersion(candidate)
@@ -94,17 +112,7 @@ function launchWithCompatibleBun(currentVersion = null) {
   process.exit(1)
 }
 
-const runningBun = globalThis.Bun
-if (!runningBun) {
-  launchWithCompatibleBun()
-}
-if (!bunVersionAtLeast(runningBun.version, MINIMUM_BUN_VERSION)) {
-  launchWithCompatibleBun(runningBun.version)
-}
-
-const packageRoot = dirname(dirname(launcherPath))
-
-function loadPackageDotenv(root) {
+export function loadPackageDotenv(root, env = process.env) {
   const envPath = join(root, '.env')
   if (!existsSync(envPath)) return
   const lines = readFileSync(envPath, 'utf8').split(/\r?\n/)
@@ -114,29 +122,66 @@ function loadPackageDotenv(root) {
     const index = line.indexOf('=')
     const key = line.slice(0, index).trim()
     let value = line.slice(index + 1).trim()
-    if (!key || process.env[key] !== undefined) continue
+    if (!key || env[key] !== undefined) continue
     if (
       (value.startsWith('"') && value.endsWith('"')) ||
       (value.startsWith("'") && value.endsWith("'"))
     ) {
       value = value.slice(1, -1)
     }
-    process.env[key] = value
+    env[key] = value
+  }
+}
+
+export function buildBackendCommand(root) {
+  const packagedPython = join(root, '.venv', 'bin', 'python')
+  if (existsSync(packagedPython)) {
+    return [packagedPython, '-m', 'ummaya.cli', '--ipc', 'stdio']
   }
+
+  return ['uv', '--directory', root, 'run', '--frozen', '--no-dev', 'ummaya', '--ipc', 'stdio']
+}
+
+export function configurePackageEnv(root, env = process.env) {
+  env.UMMAYA_PACKAGE_ROOT = root
+  if (env.UMMAYA_ALLOW_BACKEND_CMD_OVERRIDE !== '1' || !env.UMMAYA_BACKEND_CMD_JSON) {
+    env.UMMAYA_BACKEND_CMD_JSON = JSON.stringify(buildBackendCommand(root))
+  }
+  env.UMMAYA_TUI_PRIMITIVE_TIMEOUT_MS ??= PACKAGED_PRIMITIVE_TIMEOUT_MS
+  return env
+}
+
+function inspectLauncherAndExit() {
+  if (process.env.UMMAYA_LAUNCHER_INSPECT !== '1') return
+  process.stdout.write(
+    `${JSON.stringify({
+      packageRoot: process.env.UMMAYA_PACKAGE_ROOT,
+      backendCommand: JSON.parse(process.env.UMMAYA_BACKEND_CMD_JSON ?? '[]'),
+      primitiveTimeoutMs: process.env.UMMAYA_TUI_PRIMITIVE_TIMEOUT_MS,
+    })}\n`,
+  )
+  process.exit(0)
 }
 
-loadPackageDotenv(packageRoot)
-
-process.env.UMMAYA_PACKAGE_ROOT ??= packageRoot
-process.env.UMMAYA_BACKEND_CMD_JSON ??= JSON.stringify([
-  'uv',
-  '--directory',
-  packageRoot,
-  'run',
-  'ummaya',
-  '--ipc',
-  'stdio',
-])
-
-await import(join(packageRoot, 'tui/src/stubs/macro-preload.ts'))
-await import(join(packageRoot, 'tui/src/entrypoints/cli.tsx'))
+export async function main() {
+  const launcherPath = currentLauncherPath()
+  const runningBun = globalThis.Bun
+  if (!runningBun) {
+    launchWithCompatibleBun(launcherPath)
+  }
+  if (!bunVersionAtLeast(runningBun.version, MINIMUM_BUN_VERSION)) {
+    launchWithCompatibleBun(launcherPath, runningBun.version)
+  }
+
+  const packageRoot = dirname(dirname(launcherPath))
+  loadPackageDotenv(packageRoot)
+  configurePackageEnv(packageRoot)
+  inspectLauncherAndExit()
+
+  await import(join(packageRoot, 'tui/src/stubs/macro-preload.ts'))
+  await import(join(packageRoot, 'tui/src/entrypoints/cli.tsx'))
+}
+
+if (isDirectLaunch()) {
+  await main()
+}

package/bun.lock

@@ -39,6 +39,7 @@
         "auto-bind": "^5.0.1",
         "axios": "^1.15.2",
         "bidi-js": "^1.0.3",
+        "bundle": "file:./tui/src/runtime/bundle-package",
         "chalk": "^5.3.0",
         "chokidar": "^4.0.0",
         "cli-boxes": "^4.0.1",
@@ -64,6 +65,7 @@
         "proper-lockfile": "^4.1.2",
         "qrcode": "^1.5.4",
         "react": "^19.2.0",
+        "react-reconciler": "0.33.0",
         "semver": "^7.7.4",
         "shell-quote": "^1.8.3",
         "supports-hyperlinks": "^4.4.0",
@@ -446,6 +448,8 @@
 
     "buffer-equal-constant-time": ["buffer-equal-constant-time@1.0.1", "", {}, "sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA=="],
 
+    "bundle": ["bundle@file:tui/src/runtime/bundle-package", {}],
+
     "bytes": ["bytes@3.1.2", "", {}, "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg=="],
 
     "call-bind-apply-helpers": ["call-bind-apply-helpers@1.0.2", "", { "dependencies": { "es-errors": "^1.3.0", "function-bind": "^1.1.2" } }, "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ=="],
@@ -892,7 +896,7 @@
 
     "react": ["react@19.2.6", "", {}, "sha512-sfWGGfavi0xr8Pg0sVsyHMAOziVYKgPLNrS7ig+ivMNb3wbCBw3KxtflsGBAwD3gYQlE/AEZsTLgToRrSCjb0Q=="],
 
-    "react-reconciler": ["react-reconciler@0.32.0", "", { "dependencies": { "scheduler": "^0.26.0" }, "peerDependencies": { "react": "^19.1.0" } }, "sha512-2NPMOzgTlG0ZWdIf3qG+dcbLSoAc/uLfOwckc3ofy5sSK0pLJqnQLpUFxvGcN2rlXSjnVtGeeFLNimCQEj5gOQ=="],
+    "react-reconciler": ["react-reconciler@0.33.0", "", { "dependencies": { "scheduler": "^0.27.0" }, "peerDependencies": { "react": "^19.2.0" } }, "sha512-KetWRytFv1epdpJc3J4G75I4WrplZE5jOL7Yq0p34+OVOKF4Se7WrdIdVC45XsSSmUTlht2FM/fM1FZb1mfQeA=="],
 
     "readable-stream": ["readable-stream@3.6.2", "", { "dependencies": { "inherits": "^2.0.3", "string_decoder": "^1.1.1", "util-deprecate": "^1.0.1" } }, "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA=="],
 
@@ -916,7 +920,7 @@
 
     "safer-buffer": ["safer-buffer@2.1.2", "", {}, "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg=="],
 
-    "scheduler": ["scheduler@0.26.0", "", {}, "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA=="],
+    "scheduler": ["scheduler@0.27.0", "", {}, "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q=="],
 
     "semver": ["semver@7.7.4", "", { "bin": "bin/semver.js" }, "sha512-vFKC2IEtQnVhpT78h1Yp8wzwrf8CM+MzKMHGJZfBtzhZNycRFnXsHk6E5TxIkkMsgNS7mdX3AGB7x2QM2di4lA=="],
 
@@ -1132,6 +1136,8 @@
 
     "ink/cli-boxes": ["cli-boxes@3.0.0", "", {}, "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g=="],
 
+    "ink/react-reconciler": ["react-reconciler@0.32.0", "", { "dependencies": { "scheduler": "^0.26.0" }, "peerDependencies": { "react": "^19.1.0" } }, "sha512-2NPMOzgTlG0ZWdIf3qG+dcbLSoAc/uLfOwckc3ofy5sSK0pLJqnQLpUFxvGcN2rlXSjnVtGeeFLNimCQEj5gOQ=="],
+
     "ink/signal-exit": ["signal-exit@3.0.7", "", {}, "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="],
 
     "make-dir/semver": ["semver@6.3.1", "", { "bin": "bin/semver.js" }, "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA=="],
@@ -1156,8 +1162,6 @@
 
     "wrap-ansi/string-width": ["string-width@7.2.0", "", { "dependencies": { "emoji-regex": "^10.3.0", "get-east-asian-width": "^1.0.0", "strip-ansi": "^7.1.0" } }, "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ=="],
 
-    "wrap-ansi/strip-ansi": ["strip-ansi@7.2.0", "", { "dependencies": { "ansi-regex": "^6.2.2" } }, "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w=="],
-
     "xss/commander": ["commander@2.20.3", "", {}, "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ=="],
 
     "yargs/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
@@ -1188,8 +1192,6 @@
 
     "cli-truncate/slice-ansi/is-fullwidth-code-point": ["is-fullwidth-code-point@4.0.0", "", {}, "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ=="],
 
-    "cli-truncate/string-width/strip-ansi": ["strip-ansi@7.2.0", "", { "dependencies": { "ansi-regex": "^6.2.2" } }, "sha512-yDPMNjp4WyfYBkHnjIRLfca1i6KMyGCtsVgoKe/z1+6vukgaENdgGBZt+ZmKPc4gavvEZ5OgHfHdrazhgNyG7w=="],
-
     "cliui/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
 
     "cliui/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="],
@@ -1208,6 +1210,8 @@
 
     "gaxios/https-proxy-agent/agent-base": ["agent-base@7.1.4", "", {}, "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ=="],
 
+    "ink/react-reconciler/scheduler": ["scheduler@0.26.0", "", {}, "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA=="],
+
     "pdfjs-dist/canvas/simple-get": ["simple-get@3.1.1", "", { "dependencies": { "decompress-response": "^4.2.0", "once": "^1.3.1", "simple-concat": "^1.0.0" } }, "sha512-CQ5LTKGfCpvE1K0n2us+kuMPbk/q0EKl82s4aheV9oXjFEz6W/Y7oQFVJuU6QG77hRT4Ghb5RURteF5vnWjupA=="],
 
     "qrcode/yargs/cliui": ["cliui@6.0.0", "", { "dependencies": { "string-width": "^4.2.0", "strip-ansi": "^6.0.0", "wrap-ansi": "^6.2.0" } }, "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ=="],
@@ -1224,8 +1228,6 @@
 
     "wide-align/string-width/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
 
-    "wrap-ansi/strip-ansi/ansi-regex": ["ansi-regex@6.2.2", "", {}, "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="],
-
     "yargs/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
 
     "yargs/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="],
@@ -1240,8 +1242,6 @@
 
     "@inquirer/core/wrap-ansi/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="],
 
-    "cli-truncate/string-width/strip-ansi/ansi-regex": ["ansi-regex@6.2.2", "", {}, "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg=="],
-
     "pdfjs-dist/canvas/simple-get/decompress-response": ["decompress-response@4.2.1", "", { "dependencies": { "mimic-response": "^2.0.0" } }, "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw=="],
 
     "qrcode/yargs/cliui/strip-ansi": ["strip-ansi@6.0.1", "", { "dependencies": { "ansi-regex": "^5.0.1" } }, "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A=="],
@@ -1264,12 +1264,6 @@
 
     "qrcode/yargs/cliui/wrap-ansi/ansi-styles": ["ansi-styles@4.3.0", "", { "dependencies": { "color-convert": "^2.0.1" } }, "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg=="],
 
-    "qrcode/yargs/cliui/wrap-ansi/string-width": ["string-width@4.2.3", "", { "dependencies": { "emoji-regex": "^8.0.0", "is-fullwidth-code-point": "^3.0.0", "strip-ansi": "^6.0.1" } }, "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g=="],
-
     "qrcode/yargs/string-width/strip-ansi/ansi-regex": ["ansi-regex@5.0.1", "", {}, "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ=="],
-
-    "qrcode/yargs/cliui/wrap-ansi/string-width/emoji-regex": ["emoji-regex@8.0.0", "", {}, "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A=="],
-
-    "qrcode/yargs/cliui/wrap-ansi/string-width/is-fullwidth-code-point": ["is-fullwidth-code-point@3.0.0", "", {}, "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg=="],
   }
 }

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "ummaya",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "ummaya",
-      "version": "0.2.0",
+      "version": "0.2.2",
       "license": "Apache-2.0",
       "dependencies": {
         "@alcalzone/ansi-tokenize": "^0.3.0",
@@ -69,6 +69,7 @@
         "proper-lockfile": "^4.1.2",
         "qrcode": "^1.5.4",
         "react": "^19.2.0",
+        "react-reconciler": "0.33.0",
         "semver": "^7.7.4",
         "shell-quote": "^1.8.3",
         "supports-hyperlinks": "^4.4.0",
@@ -4990,6 +4991,27 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/ink/node_modules/react-reconciler": {
+      "version": "0.32.0",
+      "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.32.0.tgz",
+      "integrity": "sha512-2NPMOzgTlG0ZWdIf3qG+dcbLSoAc/uLfOwckc3ofy5sSK0pLJqnQLpUFxvGcN2rlXSjnVtGeeFLNimCQEj5gOQ==",
+      "license": "MIT",
+      "dependencies": {
+        "scheduler": "^0.26.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "react": "^19.1.0"
+      }
+    },
+    "node_modules/ink/node_modules/scheduler": {
+      "version": "0.26.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz",
+      "integrity": "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==",
+      "license": "MIT"
+    },
     "node_modules/ink/node_modules/signal-exit": {
       "version": "3.0.7",
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
@@ -6294,18 +6316,18 @@
       }
     },
     "node_modules/react-reconciler": {
-      "version": "0.32.0",
-      "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.32.0.tgz",
-      "integrity": "sha512-2NPMOzgTlG0ZWdIf3qG+dcbLSoAc/uLfOwckc3ofy5sSK0pLJqnQLpUFxvGcN2rlXSjnVtGeeFLNimCQEj5gOQ==",
+      "version": "0.33.0",
+      "resolved": "https://registry.npmjs.org/react-reconciler/-/react-reconciler-0.33.0.tgz",
+      "integrity": "sha512-KetWRytFv1epdpJc3J4G75I4WrplZE5jOL7Yq0p34+OVOKF4Se7WrdIdVC45XsSSmUTlht2FM/fM1FZb1mfQeA==",
       "license": "MIT",
       "dependencies": {
-        "scheduler": "^0.26.0"
+        "scheduler": "^0.27.0"
       },
       "engines": {
         "node": ">=0.10.0"
       },
       "peerDependencies": {
-        "react": "^19.1.0"
+        "react": "^19.2.0"
       }
     },
     "node_modules/readable-stream": {
@@ -6450,9 +6472,9 @@
       "license": "MIT"
     },
     "node_modules/scheduler": {
-      "version": "0.26.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.26.0.tgz",
-      "integrity": "sha512-NlHwttCI/l5gCPR3D1nNXtWABUmBwvZpEQiD4IXSbIDq8BzLIK/7Ir5gTFSGZDUu37K5cMNp0hFtzO38sC7gWA==",
+      "version": "0.27.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.27.0.tgz",
+      "integrity": "sha512-eNv+WrVbKu1f3vbYJT/xtiF5syA5HPIMtf9IgY/nKg0sWqzAUEvqY/xm7OcZc/qafLx/iO9FgOmeSAp4v5ti/Q==",
       "license": "MIT"
     },
     "node_modules/semver": {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ummaya",
-  "version": "0.2.0",
+  "version": "0.2.2",
   "description": "Conversational multi-agent harness for Korean public-service channels",
   "license": "Apache-2.0",
   "type": "module",
@@ -129,6 +129,7 @@
     "proper-lockfile": "^4.1.2",
     "qrcode": "^1.5.4",
     "react": "^19.2.0",
+    "react-reconciler": "0.33.0",
     "semver": "^7.7.4",
     "shell-quote": "^1.8.3",
     "supports-hyperlinks": "^4.4.0",

package/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ummaya"
-version = "0.2.0"
+version = "0.2.2"
 description = "Conversational multi-agent platform for Korean public APIs"
 readme = "README.md"
 license = "Apache-2.0"
@@ -314,7 +314,7 @@ min_confidence = 80
 
 [tool.commitizen]
 name = "cz_conventional_commits"
-version = "0.2.0"
+version = "0.2.2"
 tag_format = "v$version"
 
 # PyTorch CPU-only wheel for Docker image size discipline (SC-1: ≤ 2 GB).

package/src/ummaya/engine/engine.py

@@ -75,17 +75,6 @@ def _contains_location_dependent_key(value: object) -> bool:
     return False
 
 
-def _allowed_core_tools_for_available_adapters(
-    visible_primitives: set[str],
-    has_location_dependent_schema: bool,
-) -> frozenset[str] | None:
-    """Constrain root primitive exposure for location-independent find turns."""
-
-    if visible_primitives == {"find"} and not has_location_dependent_schema:
-        return frozenset({"find"})
-    return None
-
-
 class QueryEngine:
     """Per-session orchestrator for the UMMAYA query engine.
 
@@ -216,7 +205,7 @@ class QueryEngine:
                 ChatMessage(role="user", content=assembled.turn_attachment.content),
             )
 
-        dynamic_adapter_message, allowed_core_tool_ids = self._build_available_adapters_context(
+        dynamic_adapter_message, turn_tool_ids = self._build_available_adapters_context(
             user_message
         )
         if dynamic_adapter_message is not None:
@@ -235,7 +224,7 @@ class QueryEngine:
             tool_registry=self._tool_registry,
             config=self._config,
             session_context=self._permission_session,
-            allowed_core_tool_ids=allowed_core_tool_ids,
+            turn_tool_ids=turn_tool_ids,
             turn_start_message_index=turn_start_message_index,
         )
 
@@ -281,13 +270,13 @@ class QueryEngine:
     def _build_available_adapters_message(self, user_message: str) -> ChatMessage | None:
         """Inject BM25 adapter candidates for the current citizen utterance."""
 
-        message, _allowed_core_tool_ids = self._build_available_adapters_context(user_message)
+        message, _turn_tool_ids = self._build_available_adapters_context(user_message)
         return message
 
     def _build_available_adapters_context(
         self, user_message: str
-    ) -> tuple[ChatMessage | None, frozenset[str] | None]:
-        """Build dynamic adapter context and per-turn primitive exposure."""
+    ) -> tuple[ChatMessage | None, tuple[str, ...]]:
+        """Build dynamic adapter context and per-turn concrete tool exposure."""
 
         try:
             from ummaya.tools.search import search  # noqa: PLC0415
@@ -300,11 +289,10 @@ class QueryEngine:
             )
         except Exception:  # noqa: BLE001
             logger.exception("available_adapters auto-inject failed")
-            return None, None
+            return None, ()
 
         adapter_lines: list[str] = []
-        visible_primitives: set[str] = set()
-        has_location_dependent_schema = False
+        selected_tool_ids: list[str] = []
         primary_find_without_location = False
         visible_count = 0
         for candidate in candidates:
@@ -312,6 +300,8 @@ class QueryEngine:
                 tool = self._tool_registry.find(candidate.tool_id)
             except ToolNotFoundError:
                 continue
+            if candidate.score <= 0:
+                continue
             if tool.is_core or tool.ministry == "UMMAYA":
                 continue
             primitive = candidate.primitive if isinstance(candidate.primitive, str) else None
@@ -324,15 +314,12 @@ class QueryEngine:
             )
             if visible_count > 0 and primary_find_without_location and requires_location:
                 continue
-            if primitive is not None:
-                visible_primitives.add(primitive)
-            if requires_location:
-                has_location_dependent_schema = True
             schema_json = json.dumps(
                 candidate.input_schema_json,
                 ensure_ascii=False,
                 sort_keys=True,
             )
+            selected_tool_ids.append(candidate.tool_id)
             adapter_lines.extend(
                 [
                     f"- tool_id: {candidate.tool_id}",
@@ -340,8 +327,7 @@ class QueryEngine:
                     f"  description: {candidate.llm_description or tool.name_ko}",
                     f"  required_params: {candidate.required_params}",
                     f"  input_schema_json: {schema_json}",
-                    f"  call_hint: {candidate.primitive}("
-                    f'{{"tool_id":"{candidate.tool_id}","params":{{...}}}})',
+                    f"  call_hint: {candidate.tool_id}({{...}})",
                     f"  policy_url: {candidate.real_classification_url or ''}",
                 ]
             )
@@ -350,19 +336,16 @@ class QueryEngine:
                 break
 
         if not adapter_lines:
-            return None, None
-
-        allowed_core_tool_ids = _allowed_core_tools_for_available_adapters(
-            visible_primitives,
-            has_location_dependent_schema,
-        )
+            return None, ()
 
         content = "\n".join(
             [
                 "<available_adapters>",
                 "Use these adapter candidates for this citizen request. "
-                "For public-data lookup/list/statistics requests, call "
-                "find({tool_id, params}) with a tool_id from this block. "
+                "Call the function named exactly as tool_id with that adapter's "
+                "schema arguments. Do not wrap adapter calls in root primitives "
+                "such as find({tool_id, params}), locate({tool_id, params}), "
+                "check({tool_id, params}), or send({tool_id, params}). "
                 "Do not call locate just because the citizen text contains a "
                 "city/province name; treat that as the dataset/filter term. "
                 "Call locate only when the selected adapter schema requires "
@@ -371,7 +354,7 @@ class QueryEngine:
                 "</available_adapters>",
             ]
         )
-        return ChatMessage(role="system", content=content), allowed_core_tool_ids
+        return ChatMessage(role="system", content=content), tuple(selected_tool_ids)
 
     def set_permission_session(self, session: SessionContext | None) -> None:
         """Update the permission-pipeline session used for subsequent turns.

package/src/ummaya/engine/models.py

@@ -121,11 +121,17 @@ class QueryContext(BaseModel):
     """
 
     allowed_core_tool_ids: frozenset[str] | None = None
-    """Optional per-turn provider tool allow-list for root primitives.
+    """Legacy per-turn allow-list for primitive wrappers.
 
-    Used by the Rich REPL path when BM25 has already selected location-independent
-    public-data adapters. It keeps the exposed provider surface aligned with the
-    selected adapter primitive instead of letting unrelated root primitives race.
+    Preserved for callers that still expose the old root primitives. New turns
+    should prefer ``turn_tool_ids`` so the model sees concrete adapter schemas.
+    """
+
+    turn_tool_ids: tuple[str, ...] = ()
+    """Concrete adapter tool IDs selected for this citizen turn.
+
+    When populated, the query loop exports these concrete adapter schemas as the
+    provider tool surface instead of dumping the root primitive wrappers.
     """
 
     turn_start_message_index: int = 0