Soul-driven AI agent with permission-hardened tools, token budgets, and multi-channel access. Runs 24/7 from CLI, Telegram or More.
fix: CI findings on the integrated 1.3.1 tree
Salman Qureshi4ee08f705bae
diff --git a/docs/install-dev.sh b/docs/install-dev.shindex 4861391e..de012092 100644--- a/docs/install-dev.sh+++ b/docs/install-dev.sh@@ -20,7 +20,7 @@ CHANNEL_ENV="MERCURY_CHANNEL=dev"# (POSIX sh has no "$0"-safe dirname in every case; guard rather than trust.)case "$0" in*/*)- here=$(CDPATH= cd -- "$(dirname -- "$0")" 2>/dev/null && pwd || true)+ here=$(CDPATH='' cd -- "$(dirname -- "$0")" 2>/dev/null && pwd || true);;*)here=""diff --git a/docs/install.sh b/docs/install.shindex 24ffb3b7..bec544ad 100644--- a/docs/install.sh+++ b/docs/install.sh@@ -21,7 +21,6 @@set -euREPO="cosmicstack-labs/mercury-agent"-GITHUB_API="https://api.github.com/repos/${REPO}"GITHUB_DL="https://github.com/${REPO}/releases/download"# ----- channel ---------------------------------------------------------------diff --git a/scripts/install-dev.sh b/scripts/install-dev.shindex e9f357fa..82e17164 100755--- a/scripts/install-dev.sh+++ b/scripts/install-dev.sh@@ -18,7 +18,7 @@ set -eu# (POSIX sh has no "$0"-safe dirname in every case; guard rather than trust.)case "$0" in*/*)- here=$(CDPATH= cd -- "$(dirname -- "$0")" 2>/dev/null && pwd) || here=""+ here=$(CDPATH='' cd -- "$(dirname -- "$0")" 2>/dev/null && pwd) || here="";;*)here=""diff --git a/scripts/install.sh b/scripts/install.shindex dd6345a9..fe12c884 100755--- a/scripts/install.sh+++ b/scripts/install.sh@@ -26,7 +26,6 @@set -euREPO="cosmicstack-labs/mercury-agent"-GITHUB_API="https://api.github.com/repos/${REPO}"GITHUB_DL="${MERCURY_DOWNLOAD_BASE:-https://github.com/${REPO}/releases/download}"# ----- helpers ---------------------------------------------------------------diff --git a/scripts/verify-package.cjs b/scripts/verify-package.cjsindex 93d27321..294276d5 100755--- a/scripts/verify-package.cjs+++ b/scripts/verify-package.cjs@@ -57,7 +57,7 @@ check('shebang present', () => {check('no dangling script references', () => {const pkg = JSON.parse(readFileSync(join(modDir, 'package.json'), 'utf-8'));const scripts = pkg.scripts || {};- const devOnlyScripts = ['build', 'build:ui', 'build:bin', 'build:bin:all', 'build:bin:force', 'build:bin:all:force', 'dev', 'lint', 'typecheck', 'test', 'test:watch', 'prepublishOnly'];+ const devOnlyScripts = ['build', 'build:ui', 'build:bin', 'build:bin:all', 'build:bin:force', 'build:bin:all:force', 'dev', 'lint', 'typecheck', 'test', 'test:watch', 'prepublishOnly', 'eval', 'lint:eslint', 'lint:ratchet', 'vendor:ink', 'vendor:ink:check'];for (const [key, val] of Object.entries(scripts)) {if (devOnlyScripts.includes(key)) continue;if (val.includes('bash ')) {diff --git a/src/capabilities/shell/argv-lane.test.ts b/src/capabilities/shell/argv-lane.test.tsindex 75788e90..979eab0c 100644--- a/src/capabilities/shell/argv-lane.test.ts+++ b/src/capabilities/shell/argv-lane.test.ts@@ -151,7 +151,13 @@ describe('pinned binaries and minimal env (#103)', () => {const dirs = pinnedSearchDirs('linux', { PATH: '/tmp/evil:/usr/bin' });expect(dirs).not.toContain('/tmp/evil');expect(dirs).toContain('/usr/bin');- expect(pinnedPath('linux')).toBe('/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/homebrew/bin');+ expect(pinnedPath('linux', {})).toBe('/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/opt/homebrew/bin');+ });++ it('on Termux, pins $PREFIX/bin first (there is no /usr/bin there)', () => {+ const prefix = '/data/data/com.termux/files/usr';+ expect(pinnedSearchDirs('android', { PREFIX: prefix })[0]).toBe(join(prefix, 'bin'));+ expect(pinnedSearchDirs('linux', { PREFIX: '/usr' })).not.toContain('/usr/bin/bin');});it('resolves from the given dirs only and skips world-writable binaries', () => {diff --git a/src/capabilities/shell/argv-lane.ts b/src/capabilities/shell/argv-lane.tsindex cf0aeca8..0cf1db73 100644--- a/src/capabilities/shell/argv-lane.ts+++ b/src/capabilities/shell/argv-lane.ts@@ -303,12 +303,17 @@ export function pinnedSearchDirs(platform: NodeJS.Platform = process.platform, econst programFiles = env.ProgramFiles || 'C:\\Program Files';return [join(systemRoot, 'System32'), join(programFiles, 'Git', 'cmd')];}- return ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin', '/opt/homebrew/bin'];+ const dirs = ['/usr/bin', '/bin', '/usr/sbin', '/sbin', '/usr/local/bin', '/opt/homebrew/bin'];+ // Termux has no /usr/bin: its system binaries live in $PREFIX/bin+ // (/data/data/com.termux/files/usr/bin), owned by the app.+ const prefix = env.PREFIX;+ if (prefix && prefix.includes('com.termux')) dirs.unshift(join(prefix, 'bin'));+ return dirs;}/** The pinned PATH string for spawned tools (`:`-joined on POSIX, `;` on Windows). */-export function pinnedPath(platform: NodeJS.Platform = process.platform): string {- return pinnedSearchDirs(platform).join(platform === 'win32' ? ';' : ':');+export function pinnedPath(platform: NodeJS.Platform = process.platform, env: NodeJS.ProcessEnv = process.env): string {+ return pinnedSearchDirs(platform, env).join(platform === 'win32' ? ';' : ':');}function isTrustedExecutable(file: string): boolean {diff --git a/src/ui/static-transcript.test.ts b/src/ui/static-transcript.test.tsindex d46b2130..04fd1e61 100644--- a/src/ui/static-transcript.test.ts+++ b/src/ui/static-transcript.test.ts@@ -40,14 +40,14 @@ describe('ink static-transcript crash fixes', () => {expect(patch).toContain('itemKey');});- it('has the patch applied to the installed ink', () => {- // If this fails after a dependency change, the postinstall hook did not- // run (or patches/ was lost) — every <Static> unmount is a latent crash.- const reconciler = read('node_modules/ink/build/reconciler.js');+ it('has the patch applied to the vendored ink that ships in the bundle', () => {+ // Ink is vendored and bundled (ADR-017); node_modules/ink is stock and+ // unused at runtime. If this fails, regenerate with `npm run vendor:ink`.+ const reconciler = read('vendor/ink/build/reconciler.js');expect(reconciler).toContain('clearYogaRefs');expect(reconciler).toContain('Array.isArray(node.childNodes)');expect(reconciler).toContain('rootNode.staticNode = undefined');- const staticComponent = read('node_modules/ink/build/components/Static.js');+ const staticComponent = read('vendor/ink/build/components/Static.js');expect(staticComponent).toContain('itemKey');});