@awak-app/simy-cli 0.7.23 → 0.7.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@awak-app/simy-cli",
-  "version": "0.7.23",
+  "version": "0.7.25",
   "description": "Local SIMY executor for non-coding Local Tasks and Agentic Loop runs.",
   "type": "module",
   "bin": {

package/src/agent.js

@@ -1,3 +1,4 @@
+import { connectionOverview, readSqmConnectionObservation } from './connection-overview.js';
 import { readLocalPhotoSource } from "./local-photos.js";
 import { resolveLocalTaskDestination, saveLocalTaskDestination } from "./local-task-destination.js";
 import { observePairedNativeIdentities } from './native-provider-identity.js';
@@ -1217,7 +1218,7 @@ export async function startAgent({
 
       if (req.method === "GET" && url.pathname === "/v1/auth/browser") {
         if (req.headers.host !== `127.0.0.1:${port}`) { json(res, 403, { error: "Invalid local host." }); return; }
-        const page = browserHandoffPage();
+        const page = browserHandoffPage(apiOrigin);
         res.writeHead(200, page.headers).end(page.html);
         return;
       }
@@ -1516,6 +1517,7 @@ export async function startAgent({
           const previousSession = session ?? reclaimableSession;
           const authorizedSession = {
             token: String(body.token || ""),
+            email: typeof body.email === "string" && body.email.length <= 254 ? body.email : null,
             device_id: typeof body.device_id === "string" ? body.device_id : null,
             api_origin: apiOrigin,
             api_base_url: apiBaseUrl,
@@ -2857,8 +2859,21 @@ export async function startAgent({
     const { codex, claude } = deferStartupSynchronization
       ? providerStatuses
       : await readProviderStatuses();
+    const overviewSession = session;
+    const overviewAccess = desktopAccess.snapshot();
+    let overviewSqm = { state: 'unknown' };
+    if (auth.state === 'signed_in' && !pendingOrganization) {
+      try { overviewSqm = await readSqmConnectionObservation({ endpoint: process.env.SIMY_SQM_BUNDLE_URL?.trim() || new URL('sqm/knowledge-bundle', resolveWebApiBaseUrl(apiOrigin, overviewSession?.api_base_url)).href,
+        accountId: overviewSession?.account_id || overviewSession?.auth_user_id || overviewSession?.device_id,
+        organizationId: overviewSession?.organization_id || overviewSession?.org_id }, { root: process.env.SIMY_SQM_CACHE_DIR || join(sessionRoot, 'sqm') }); } catch { /* A missing endpoint must not block the status frame. */ }
+    }
+    // An organization switch/sign-out while reading local metadata must not
+    // publish an old tenant's identity or SQM result in a fresh frame.
+    const overview = connectionOverview({ webOrigin: apiOrigin, session, access: session === overviewSession ? overviewAccess : null,
+      signedIn: session === overviewSession && auth.state === 'signed_in', switching: Boolean(pendingOrganization), sqm: overviewSqm });
     return {
       schemaVersion: 1,
+      connectionOverview: overview,
       sampledAt: new Date().toISOString(),
       version: CLI_VERSION,
       webOrigin: apiOrigin,

package/src/auto-update.js

@@ -15,6 +15,7 @@ import path from "node:path";
 import { fileURLToPath } from "node:url";
 import { promisify } from "node:util";
 
+import { daemonRestartCommand } from "./web-origin.js";
 import { openExternalUrl } from "./browser.js";
 import {
   installMacosInstallerRelease,
@@ -1094,7 +1095,7 @@ export function autoUpdateHelpText({ installMode = null, webOrigin = null } = {}
   return [
     "Recommended installation (enables verified CLI auto-update):",
     `  npm install -g ${CLI_PACKAGE_NAME}`,
-    "  simy --daemon",
+    `  ${daemonRestartCommand(webOrigin)}`,
   ].join("\n");
 }
 
@@ -1131,7 +1132,7 @@ export function updateAction(version, { installMode = "global_npm", webOrigin }
   return {
     id: "install_global_cli",
     label: "Install and restart SIMY",
-    command: `npm install -g ${CLI_PACKAGE_NAME}@${version} && simy --daemon`,
+    command: `npm install -g ${CLI_PACKAGE_NAME}@${version} && ${daemonRestartCommand(webOrigin)}`,
   };
 }
 

package/src/browser-handoff.js

@@ -1,3 +1,4 @@
+import { normalizeWebOrigin } from "./web-origin.js";
 import { createDecipheriv, createHash } from "node:crypto";
 
 export const BROWSER_HANDOFF_TRANSPORT = "loopback_redirect_v1";
@@ -33,6 +34,14 @@ const copy = ja ? {
 };
 document.documentElement.lang = ja ? 'ja' : 'en';
 const title = document.getElementById('title'), message = document.getElementById('message');
+const environment = document.getElementById('environment');
+const origin = environment.dataset.origin;
+const host = new URL(origin).hostname;
+const label = origin === 'https://app.simy.one' ? (ja ? '本番' : 'Production')
+  : origin === 'https://app-dev.simy.one' ? (ja ? '開発' : 'Development')
+  : ['localhost', '127.0.0.1', '[::1]'].includes(host) ? (ja ? 'ローカル開発' : 'Local development')
+  : (ja ? 'カスタムホスト' : 'Custom host');
+environment.textContent = (ja ? '接続先環境' : 'Connection environment') + ': ' + label + ' · ' + origin;
 title.textContent = copy.title; message.textContent = copy.waiting;
 const handoff = new URLSearchParams(location.hash.slice(1)).get('handoff');
 history.replaceState(null, '', location.pathname);
@@ -54,15 +63,17 @@ history.replaceState(null, '', location.pathname);
 
 // A self-contained local page: credentials never enter the URL query, HTTP
 // request, history or third-party resources. Only the encrypted fragment does.
-const style = `:root{color-scheme:light dark;--bg:#ffffff;--card:#f6f5f4;--ink:#0d0d0d;--muted:#615d59;--line:#e6e6e6;--accent:#0075de} @media(prefers-color-scheme:dark){:root{--bg:#1a1918;--card:#252320;--ink:#f5f3f0;--muted:#b8b3ad;--line:#31302f;--accent:#3b9eff}}*{box-sizing:border-box}body{margin:0;min-height:100dvh;display:grid;place-items:center;padding:24px;background:var(--bg);color:var(--ink);font:16px/1.5 system-ui,sans-serif}main{max-width:480px;width:100%;padding:32px;border:1px solid var(--line);border-radius:12px;background:var(--card)}.brand{color:var(--accent);font-weight:600;font-size:14px}h1{font-size:24px;font-weight:600;margin:16px 0}p{color:var(--muted);margin:0}body[data-state=failed] h1{color:var(--ink)}`;
+const style = `:root{color-scheme:light dark;--bg:#ffffff;--card:#f6f5f4;--ink:#0d0d0d;--muted:#615d59;--line:#e6e6e6;--accent:#0075de} @media(prefers-color-scheme:dark){:root{--bg:#1a1918;--card:#252320;--ink:#f5f3f0;--muted:#b8b3ad;--line:#31302f;--accent:#3b9eff}}*{box-sizing:border-box}body{margin:0;min-height:100dvh;display:grid;place-items:center;padding:24px;background:var(--bg);color:var(--ink);font:16px/1.5 system-ui,sans-serif}main{max-width:480px;width:100%;padding:32px;border:1px solid var(--line);border-radius:12px;background:var(--card)}.brand{color:var(--accent);font-weight:600;font-size:14px}h1{font-size:24px;font-weight:600;margin:16px 0}p{color:var(--muted);margin:0}#environment{margin-top:16px;font-size:14px;overflow-wrap:anywhere}body[data-state=failed] h1{color:var(--ink)}`;
 const hash = value => createHash("sha256").update(value).digest("base64");
-export function browserHandoffPage() {
+export function browserHandoffPage(webOrigin) {
+  const origin = normalizeWebOrigin(webOrigin);
+  const escapedOrigin = origin.replace(/[&<>"']/g, value => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[value]);
   return {
     headers: {
       "Content-Type": "text/html; charset=utf-8", "Cache-Control": "no-store",
       "Referrer-Policy": "no-referrer", "X-Content-Type-Options": "nosniff",
       "Content-Security-Policy": `default-src 'none'; script-src 'sha256-${hash(script)}'; style-src 'sha256-${hash(style)}'; connect-src 'self'; img-src data:; frame-ancestors 'none'; base-uri 'none'; form-action 'none'`,
     },
-    html: `<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>SIMY connection</title><link rel="icon" href="data:,"><style>${style}</style></head><body><main aria-live="polite" aria-atomic="true"><div class="brand">SIMY</div><h1 id="title">Connecting to SIMY</h1><p id="message">Keep SIMY open while connecting.</p><noscript>JavaScript is required. Return to SIMY and reconnect using a browser with JavaScript enabled.</noscript></main><script>${script}</script></body></html>`,
+    html: `<!doctype html><html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width,initial-scale=1"><title>SIMY connection</title><link rel="icon" href="data:,"><style>${style}</style></head><body><main aria-live="polite" aria-atomic="true"><div class="brand">SIMY</div><h1 id="title">Connecting to SIMY</h1><p id="message">Keep SIMY open while connecting.</p><p id="environment" data-origin="${escapedOrigin}">Connection environment: ${escapedOrigin}</p><noscript>JavaScript is required. Return to SIMY and reconnect using a browser with JavaScript enabled.</noscript></main><script>${script}</script></body></html>`,
   };
 }

package/src/cli-contract.js

@@ -14,7 +14,7 @@ import {
 } from "./durable-local-task-steps-contract.js";
 import { buildExecutionCapabilityContract } from "./execution-capability-contract.js";
 
-export const CLI_VERSION = "0.7.23";
+export const CLI_VERSION = "0.7.25";
 export const CLI_API_CONTRACT_VERSION = 10;
 
 export function narrativeImageCapabilityMetadata() {

package/src/connection-overview.js

@@ -0,0 +1,58 @@
+import { createHash, randomUUID } from 'node:crypto';
+import { hostname } from 'node:os';
+import { join } from 'node:path';
+import { mkdir, readFile, rename, rm, writeFile } from 'node:fs/promises';
+import { defaultSessionRoot } from './session-store.js';
+
+const safeText = (value, limit = 160) => typeof value === 'string' ? value.replace(/[\x00-\x1f\x7f]/g, '').slice(0, limit) : null;
+const scopeKey = ({ endpoint, accountId, organizationId }) => {
+  if (!endpoint || !accountId || !organizationId) return null;
+  try { const url = new URL(endpoint); url.username = ''; url.password = ''; url.search = ''; url.hash = '';
+    return createHash('sha256').update(JSON.stringify([url.href, accountId, organizationId])).digest('hex');
+  } catch { return null; }
+};
+const observationPath = (scope, root) => { const key = scopeKey(scope); return key ? join(root, 'connection-observations', `${key}.json`) : null; };
+
+// Only metadata of an actual online bundle lookup; never credentials, rules,
+// executable checks or inferred cross-organization registrations.
+export async function recordSqmConnectionObservation(scope, result, { root = process.env.SIMY_SQM_CACHE_DIR || join(defaultSessionRoot(), 'sqm'), now = Date.now() } = {}) {
+  const target = observationPath(scope, root);
+  if (!target || !['cloud', 'cache_revalidated', 'unavailable'].includes(result?.source)) return;
+  const bundle = result.bundle;
+  const verified = bundle?.organization_id === scope.organizationId && bundle?.system_scope?.organization_id === scope.organizationId;
+  const repository = safeText(scope.repository, 200);
+  if (!repository || !/^[^/\s]+\/[^/\s]+$/.test(repository)) return;
+  const value = { version: 1, state: verified ? 'verified' : 'unavailable', repository,
+    checkedAt: new Date(now).toISOString(), expiresAt: verified ? bundle.expires_at : null };
+  const temp = `${target}.${randomUUID()}.tmp`;
+  try { await mkdir(join(root, 'connection-observations'), { recursive: true, mode: 0o700 });
+    await writeFile(temp, JSON.stringify(value), { mode: 0o600 }); await rename(temp, target);
+  } finally { await rm(temp, { force: true }); }
+}
+
+export async function readSqmConnectionObservation(scope, { root = process.env.SIMY_SQM_CACHE_DIR || join(defaultSessionRoot(), 'sqm'), now = Date.now() } = {}) {
+  const target = observationPath(scope, root);
+  if (!target) return { state: 'unknown' };
+  try {
+    const raw = await readFile(target, 'utf8'); if (raw.length > 4096) return { state: 'unknown' };
+    const v = JSON.parse(raw), at = Date.parse(v.checkedAt);
+    if (v.version !== 1 || !['verified', 'unavailable'].includes(v.state) || !Number.isFinite(at) || at > now ||
+        typeof v.repository !== 'string' || !/^[^/\s]+\/[^/\s]+$/.test(v.repository) || v.repository.length > 200) return { state: 'unknown' };
+    const current = now - at <= 5 * 60 * 1000 && (v.state !== 'verified' || Date.parse(v.expiresAt) > now);
+    return { state: current ? v.state : 'previous', repository: safeText(v.repository, 200), checkedAt: v.checkedAt };
+  } catch { return { state: 'unknown' }; }
+}
+
+export function connectionEnvironment(origin) {
+  try { const url = new URL(origin); if (!['http:', 'https:'].includes(url.protocol) || url.username || url.password || url.search || url.hash || url.pathname !== '/') return { kind: 'unknown', origin: null };
+    return { kind: url.origin === 'https://app.simy.one' ? 'production' : url.origin === 'https://app-dev.simy.one' ? 'development' : 'custom', origin: url.origin };
+  } catch { return { kind: 'unknown', origin: null }; }
+}
+
+export function connectionOverview({ webOrigin, session, access, signedIn, switching, sqm, deviceName = hostname() }) {
+  const scopeReady = signedIn && !switching && session?.organization_id && access?.organizationId === session.organization_id && access?.state === 'ready';
+  return { device: { name: safeText(deviceName) || null }, environment: connectionEnvironment(webOrigin),
+    organization: { name: signedIn && access?.organizationId === session?.organization_id ? safeText(access?.organizationName) : null,
+      state: switching ? 'switching' : scopeReady ? 'ready' : 'unknown' },
+    sqm: scopeReady ? (sqm || { state: 'unknown' }) : { state: 'unknown' } };
+}

package/src/desktop-status.js

@@ -67,6 +67,7 @@ export function desktopAuthStatus(session, { now = Date.now(), webOrigin = null
     state: valid ? "signed_in" : exists ? "expired" : "signed_out",
     expiresAt: typeof session?.expires_at === "string" ? session.expires_at : null,
     userLabel: sessionUserLabel(session),
+    userEmail: valid ? sessionUserEmail(session) : null,
     userId: valid ? (session.account_id ?? session.auth_user_id ?? null) : null,
   };
 }
@@ -323,6 +324,14 @@ function reportPresentation(result, allowSchemaLess = false) {
   } catch { return null; }
 }
 
+function sessionUserEmail(session) {
+  for (const key of ["email", "user_label"]) {
+    const value = session?.[key];
+    if (typeof value === "string" && value.trim().length <= 254 && /^[^\s@]+@[^\s@]+\.[^\s@]+$/.test(value.trim())) return value.trim();
+  }
+  return null;
+}
+
 function sessionUserLabel(session) {
   if (!session) return null;
   for (const key of ["user_label", "display_name", "email", "account_id", "auth_user_id"]) {

package/src/sqm/bundle-store.js

@@ -1,3 +1,4 @@
+import { recordSqmConnectionObservation } from '../connection-overview.js';
 import { ADVISORY_GUIDANCE_CAPABILITY, isAdvisoryGuidance } from './advisory-guidance.js';
 import { safeSqmDiagnostic } from "./diagnostics.js";
 import { createHash, createPublicKey } from "node:crypto";
@@ -25,13 +26,40 @@ export class SqmIncompatibleCliError extends Error {
 }
 
 export async function loadKnowledgeBundle({
-  repository,
-  cliVersion,
   endpoint = process.env.SIMY_SQM_BUNDLE_URL,
   token = process.env.SIMY_SQM_TOKEN || process.env.SIMY_ACCESS_TOKEN,
   accountId = process.env.SIMY_SQM_ACCOUNT_ID || (token ? `token:${createHash("sha256").update(token).digest("hex")}` : "anonymous"),
   organizationId = process.env.SIMY_SQM_ORGANIZATION_ID,
   cacheRoot = process.env.SIMY_SQM_CACHE_DIR || path.join(process.env.SIMY_HOME?.trim() || path.join(homedir(), ".simy"), "sqm"),
+  ...options
+}) {
+  const context = { ...options, endpoint, token, accountId, organizationId, cacheRoot };
+  const observe = async result => {
+    if (options.offline || !endpoint || !accountId || !organizationId) return;
+    try { await recordSqmConnectionObservation(context, result, { root: cacheRoot, now: options.now }); }
+    catch { /* Display metadata must not change SQM behavior. */ }
+  };
+  try {
+    const result = await loadKnowledgeBundleImpl(context);
+    // An online fallback retains usable knowledge, but does not confirm the
+    // current connection. Offline/cache-only reads never refresh this record.
+    await observe(result.source === 'stale_cache' ? { source: 'unavailable' } : result);
+    return result;
+  } catch (error) {
+    // Cancellation is an intentional stop, not a failed connection attempt.
+    if (!options.signal?.aborted) await observe({ source: 'unavailable' });
+    throw error;
+  }
+}
+
+async function loadKnowledgeBundleImpl({
+  repository,
+  cliVersion,
+  endpoint,
+  token,
+  accountId,
+  organizationId,
+  cacheRoot,
   ttlMs = numberEnv("SIMY_SQM_CACHE_TTL_MS", DEFAULT_TTL_MS),
   offline = false,
   refresh = false,

package/src/sqm/provider-plugin-status.js

@@ -1,9 +1,22 @@
 import { homedir } from 'node:os';
 import { join } from 'node:path';
+import { readFile } from 'node:fs/promises';
 import { resolveBackendExecutable } from '../backend-executable.js';
 import { runProviderCommand } from './provider-command.js';
 import { CLAUDE_PLUGIN_SELECTOR } from './claude-plugin.js';
 
+// The managed marketplace selects the inventory scope, never installation or
+// enablement evidence. Those still come from the provider's actual response.
+async function managedCodexMarketplace({ home, signal }) {
+  try {
+    const bytes = await readFile(join(home, '.agents', 'plugins', 'marketplace.json'), { encoding: 'utf8', signal });
+    if (Buffer.byteLength(bytes) > 64 * 1024) return null;
+    const manifest = JSON.parse(bytes);
+    return /^[A-Za-z0-9_-]+$/.test(manifest?.name || '') && Array.isArray(manifest.plugins) &&
+      manifest.plugins.some(entry => entry?.name === 'simy') ? manifest.name : null;
+  } catch { return null; }
+}
+
 export const unavailablePluginStatus = () => ({ state: 'unknown', installed: null, enabled: null });
 
 // Provider inventories describe the actual installation and enablement. Managed
@@ -15,7 +28,7 @@ export async function inspectProviderPlugins({ home = homedir(),
   claudeHome = process.env.CLAUDE_CONFIG_DIR || join(home, '.claude'),
   resolveExecutable = resolveBackendExecutable, run = runProviderCommand,
   timeoutMs = 5_000, signal, providers = ['codex', 'claude'], details = false,
-  onDiagnostic = () => {},
+  onDiagnostic = () => {}, readCodexMarketplace = managedCodexMarketplace,
 } = {}) {
   if (providers.some(provider => !['codex', 'claude'].includes(provider))) throw new Error('Unsupported provider.');
   const inspect = async provider => {
@@ -30,7 +43,12 @@ export async function inspectProviderPlugins({ home = homedir(),
       const executable = await resolveExecutable(provider, { signal, timeoutMs });
       if (signal?.aborted) return unavailable('cancelled');
       if (!executable) return unavailable('cli_missing');
-      const { stdout } = await run(executable, ['plugin', 'list', '--json'], {
+      const marketplace = provider === 'codex' ? await readCodexMarketplace({ home, signal }) : null;
+      if (signal?.aborted) return unavailable('cancelled');
+      // A global inventory may contact unrelated remote marketplaces. Query the
+      // configured SIMY source so their network delays cannot hide local state.
+      const args = ['plugin', 'list', '--json', ...(marketplace ? ['--marketplace', marketplace] : [])];
+      const { stdout } = await run(executable, args, {
         timeout: timeoutMs, maxBuffer: 1024 * 1024, signal, cwd: home,
         env: { ...process.env, HOME: home,
           ...(provider === 'codex' ? { CODEX_HOME: codexHome } : { CLAUDE_CONFIG_DIR: claudeHome }) },
@@ -39,7 +57,7 @@ export async function inspectProviderPlugins({ home = homedir(),
       const entries = provider === 'codex' ? payload?.installed : payload;
       if (!Array.isArray(entries)) return unavailable('invalid_inventory');
       const matches = entries.filter(entry => provider === 'codex'
-        ? typeof entry?.pluginId === 'string' && /^simy@[A-Za-z0-9_-]+$/.test(entry.pluginId)
+        ? typeof entry?.pluginId === 'string' && /^simy@[A-Za-z0-9_-]+$/.test(entry.pluginId) && (!marketplace || entry.pluginId === `simy@${marketplace}`)
         : entry?.id === CLAUDE_PLUGIN_SELECTOR);
       // Prefer the account installation; report a project-only install explicitly
       // rather than silently treating it as an installation for every project.

package/src/web-origin.js

@@ -44,3 +44,10 @@ export function isRequestOriginAllowed(requestOrigin, webOrigin) {
     return false;
   }
 }
+
+// Explicitly retain the resolved host when a command is copied to a fresh shell.
+export function daemonRestartCommand(webOrigin) {
+  const origin = resolveWebOrigin(webOrigin);
+  const quotedOrigin = '"' + origin.replace(/["\\$`]/g, "\\$&") + '"';
+  return `simy --daemon --host ${quotedOrigin}`;
+}