@notis_ai/cli 0.2.0-beta.178.1 → 0.2.0-beta.1792022492092.1

package/src/runtime/profiles.js

@@ -1,16 +1,14 @@
-import { randomUUID } from 'node:crypto';
 import {
   existsSync,
   mkdirSync,
   readFileSync,
   renameSync,
-  rmSync,
-  statSync,
   writeFileSync,
 } from 'node:fs';
 import { homedir } from 'node:os';
 import { dirname, join, parse, resolve } from 'node:path';
 import { CliError, EXIT_CODES } from './errors.js';
+import { withConfigFileWriteLock } from './config-lock.js';
 import { getAuthRecovery, quoteShellArgument } from './auth-recovery.js';
 import { channelFromProfile, cliCommandForChannel, isReleaseChannel } from './channel.js';
 
@@ -34,14 +32,6 @@ const WORKTREE_RUNTIME_FILENAME = join('.context', 'notis-runtime.json');
 const WORKTREE_ROUTING_FILENAME = join('.context', 'notis-routing.json');
 const LOCAL_API_HOSTS = new Set(['localhost', '127.0.0.1', '::1']);
 const LIVE_API_HOSTS = new Set(['api.notis.ai', 'api-beta.notis.ai']);
-// Cross-process write lock over ~/.notis/config.json. Independent `notis`
-// processes (a `login` in one terminal and a `tools exec` in another) all
-// rewrite this file, so the lock directory name and these three timings are the
-// whole coordination protocol. Guarded by the concurrency test in
-// packages/cli/test/runtime-auth.test.js.
-const CONFIG_WRITE_LOCK_TIMEOUT_MS = 5_000;
-const CONFIG_WRITE_LOCK_STALE_MS = 2_000;
-const CONFIG_WRITE_LOCK_POLL_MS = 10;
 
 function clone(value) {
   return JSON.parse(JSON.stringify(value));
@@ -372,103 +362,11 @@ function writeRawConfig(configFile, config) {
   renameSync(temporaryFile, configFile);
 }
 
-// The lock records who holds it and when they took it. Reclaiming a stale lock
-// by mtime alone is not safe: the reclaimer cannot tell an abandoned lock from
-// one it is about to steal from a live writer, and the victim's own release
-// would then delete the thief's lock and admit a third writer. Both sides are
-// on the same host, so the stored timestamp and Date.now() share a clock.
-function readLockOwner(lockDirectory) {
-  try {
-    return JSON.parse(readFileSync(join(lockDirectory, 'owner'), 'utf-8'));
-  } catch {
-    return null;
-  }
-}
-
-function lockDirectoryMtime(lockDirectory) {
-  try {
-    return statSync(lockDirectory).mtimeMs;
-  } catch {
-    return null;
-  }
-}
-
-function publishConfigWriteLock(lockDirectory, ownerId) {
-  const candidateDirectory = `${lockDirectory}.candidate-${ownerId}`;
-  try {
-    mkdirSync(candidateDirectory);
-    writeFileSync(
-      join(candidateDirectory, 'owner'),
-      JSON.stringify({ id: ownerId, at: Date.now() }),
-      { mode: 0o600 },
-    );
-    try {
-      renameSync(candidateDirectory, lockDirectory);
-      return true;
-    } catch (error) {
-      if (!existsSync(lockDirectory)) throw error;
-      return false;
-    }
-  } finally {
-    rmSync(candidateDirectory, { recursive: true, force: true });
-  }
-}
-
+// Independent `notis` processes and Desktop all rewrite this file. The lock
+// protocol lives in config-lock.js, shared with computer.json and mirrored by
+// Desktop.
 function withConfigWriteLock(callback) {
-  const configFile = resolveConfigFile();
-  const lockDirectory = `${configFile}.write-lock`;
-  const ownerId = `${process.pid}.${randomUUID()}`;
-  const deadline = Date.now() + CONFIG_WRITE_LOCK_TIMEOUT_MS;
-  mkdirSync(dirname(configFile), { recursive: true });
-  for (;;) {
-    if (!existsSync(lockDirectory) && publishConfigWriteLock(lockDirectory, ownerId)) {
-      break;
-    }
-
-    const owner = readLockOwner(lockDirectory);
-    const observedMtime = lockDirectoryMtime(lockDirectory);
-    const ownerIsStale =
-      owner?.id && Date.now() - Number(owner.at) > CONFIG_WRITE_LOCK_STALE_MS;
-    const ownerlessIsStale =
-      !owner
-      && observedMtime !== null
-      && Date.now() - observedMtime > CONFIG_WRITE_LOCK_STALE_MS;
-    if (ownerIsStale || ownerlessIsStale) {
-      try {
-        const currentOwner = readLockOwner(lockDirectory);
-        const ownerUnchanged = owner?.id
-          ? currentOwner?.id === owner.id
-          : !currentOwner && lockDirectoryMtime(lockDirectory) === observedMtime;
-        if (ownerUnchanged) {
-          rmSync(lockDirectory, { recursive: true, force: true });
-          continue;
-        }
-      } catch {
-        // Losing the reclaim race is normal; fall through and keep waiting.
-      }
-    }
-    if (Date.now() >= deadline) {
-      throw new Error(`Timed out waiting to update ${configFile}`);
-    }
-    Atomics.wait(
-      new Int32Array(new SharedArrayBuffer(4)),
-      0,
-      0,
-      CONFIG_WRITE_LOCK_POLL_MS,
-    );
-  }
-  try {
-    return callback(configFile);
-  } finally {
-    try {
-      // Never release a lock that was reclaimed from us while we worked.
-      if (readLockOwner(lockDirectory)?.id === ownerId) {
-        rmSync(lockDirectory, { recursive: true, force: true });
-      }
-    } catch {
-      // The lock may already have been removed after an interrupted write.
-    }
-  }
+  return withConfigFileWriteLock(resolveConfigFile(), callback);
 }
 
 export function saveConfig(config) {

package/src/runtime/retired-sdk-files.js

@@ -0,0 +1,20 @@
+/** Exact canonical files retired by the one-Shadow-runtime cutover.
+ * Modified or additional source is retained for explicit reconciliation. */
+// Host mounting code stays in the canonical SDK and CLI host bundle, not in
+// authored apps' public SDK mirror. It is not a public package export.
+export const HOST_ONLY_SDK_FILES = Object.freeze(['src/presentation.tsx']);
+
+export const RETIRED_SDK_FILES = Object.freeze({
+  "src/presentation.tsx": [
+    "d29022f92e1e96b451b62cc8a561878a1c0cf8a3b4c0419181de7266f8a1b525"
+  ],
+  "src/isolatedHost.tsx": [
+    "7f59049281a9533d39c557ca75635073c2f404f1eb0a528b274323d61db776cd"
+  ],
+  "src/frameProtocol.ts": [
+    "f32337ddb507718be04289a4acf50cf2485698bc716556230f35f06a6f633f19"
+  ],
+  "src/frameIsolation.ts": [
+    "8b57cb38f618eefc4133ae50fbf2b37bbdef5be02e44b39758d8328fb2a59ab6"
+  ]
+});

package/src/runtime/screenshot-framing.js

@@ -0,0 +1,85 @@
+/** Runs only in the capture harness, never in an installed app. */
+export function measureScreenshotContent() {
+  const root = document.getElementById('root');
+  if (!root) return null;
+  const viewportWidth = document.documentElement.clientWidth;
+  const visible = (element) => {
+    const rect = element.getBoundingClientRect();
+    const style = getComputedStyle(element);
+    return rect.width > 0 && rect.height > 0
+      && style.display !== 'none' && style.visibility !== 'hidden';
+  };
+
+  // Follow layout wrappers only while they contain the entire visible app.
+  // Never select one column, card, or control out of a multi-pane layout.
+  let node = root;
+  let content = null;
+  while (node) {
+    const hasOwnText = Array.from(node.childNodes).some(
+      (child) => child.nodeType === 3 && child.textContent.trim(),
+    );
+    const children = Array.from(node.children).filter(visible);
+    if (hasOwnText || children.length !== 1) break;
+    node = children[0];
+    const rect = node.getBoundingClientRect();
+    if (['DIV', 'MAIN', 'SECTION', 'ARTICLE', 'FORM'].includes(node.tagName)
+      && rect.width >= 320 && rect.height >= 160
+      && rect.width < viewportWidth * 0.9) {
+      content = node;
+    }
+  }
+  if (!content) return null;
+  content.setAttribute('data-notis-screenshot-content', '');
+  const rect = content.getBoundingClientRect();
+  return {
+    selector: '[data-notis-screenshot-content]',
+    width: rect.width,
+    height: rect.height,
+    viewport_width: viewportWidth,
+  };
+}
+
+export const MEASURE_SCREENSHOT_CONTENT_SCRIPT = `(${measureScreenshotContent.toString()})()`;
+
+/** Keep long pages readable, and rasterize bounded views at their final width. */
+export function contentCapturePlan(bounds, viewport, outputWidth, outputHeight) {
+  const aspect = outputWidth / outputHeight;
+  if (bounds.width / bounds.height < aspect * 0.75) {
+    const width = Math.max(768, Math.ceil((bounds.width + 32) / 8) * 8);
+    return { focus: false, width, height: Math.round(width / aspect), scale: outputWidth / width };
+  }
+  return {
+    focus: true,
+    width: viewport.width,
+    height: viewport.height,
+    scale: Math.min(4, outputWidth / bounds.width),
+  };
+}
+
+export function safeViewportHeight(rectangles, height) {
+  const crossing = rectangles.filter((rect) => rect.top < height && rect.bottom > height
+    && rect.top >= height * 0.85);
+  return crossing.length
+    ? Math.max(Math.ceil(height * 0.85), Math.floor(Math.min(...crossing.map((rect) => rect.top)) - 8))
+    : height;
+}
+
+// End a long-page viewport in whitespace rather than through a text line or
+// control. Only geometry leaves the browser; no page text is returned.
+export const SAFE_VIEWPORT_HEIGHT_SCRIPT = `(() => {
+  const root = document.getElementById('root');
+  if (!root) return innerHeight;
+  const rects = [];
+  const walker = document.createTreeWalker(root, NodeFilter.SHOW_TEXT);
+  let node;
+  while ((node = walker.nextNode())) {
+    if (!node.textContent.trim() || getComputedStyle(node.parentElement).visibility !== 'visible') continue;
+    const range = document.createRange(); range.selectNodeContents(node);
+    for (const rect of range.getClientRects()) rects.push({ top: rect.top, bottom: rect.bottom });
+  }
+  for (const control of root.querySelectorAll('button,input,select,textarea')) {
+    const rect = control.getBoundingClientRect();
+    rects.push({ top: rect.top, bottom: rect.bottom });
+  }
+  return (${safeViewportHeight.toString()})(rects, innerHeight);
+})()`;

package/src/runtime/skill-sync/cloud-client.ts

@@ -1,5 +1,7 @@
-import { createSkillBundleBase64 } from './local-scanner';
-import type { AgentTargets, LocalSkill, SyncPullResponse, SyncPushResponse, SyncSettings } from './types';
+import { captureNativeSkillFiles, createSkillBundleBase64 } from './local-scanner';
+import { createHash } from 'node:crypto';
+import { checkedNativeReference } from './native-identity';
+import type { AgentTargets, LocalSkill, NativeSkillReference, SyncPullResponse, SyncPushResponse, SyncSettings } from './types';
 
 type JsonBody = Record<string, unknown> | undefined;
 
@@ -34,7 +36,7 @@ export async function fetchSyncSettings(serverUrl: string, jwt: string): Promise
 
 export async function pullSkills(serverUrl: string, jwt: string): Promise<SyncPullResponse> {
   return requestJson<SyncPullResponse>(`${serverUrl}/portal_skills/sync-pull`, jwt, {
-    body: {},
+    body: { skill_sync_protocol: 2 },
   });
 }
 
@@ -49,11 +51,16 @@ export async function pushChangedSkills(
     skill_md: skill.skillMd,
     source_url: skill.sourceUrl,
     folder_hash: skill.folderHash,
-    bundle_base64: await createSkillBundleBase64(skill),
+    ...(skill.nativeReference ? { bundle_files: await captureNativeSkillFiles(skill) }
+      : { bundle_base64: await createSkillBundleBase64(skill) }),
+    ...(skill.cloudId ? { cloud_id: skill.cloudId } : {}),
+    ...(skill.nativeReference ? { native_reference: skill.nativeReference, display_name: skill.displayName,
+      native_scope: skill.nativeScope } : {}),
   })));
 
   return requestJson<SyncPushResponse>(`${serverUrl}/portal_skills/sync-push`, jwt, {
     body: {
+      skill_sync_protocol: 2,
       skills: payloadSkills,
     },
   });
@@ -75,7 +82,22 @@ export async function updateAgentTargets(
   skillId: string,
   targets: Partial<AgentTargets>,
   expectedUpdatedAt?: string,
+  native?: { reference: NativeSkillReference; settingsRevision: number },
 ): Promise<{ success: boolean; agent_targets: AgentTargets; updated_at?: string }> {
+  if (native) {
+    checkedNativeReference(native.reference, skillId);
+    if (!Number.isSafeInteger(native.settingsRevision) || native.settingsRevision < 0) throw new Error('Refresh native Skill settings before changing assignments.');
+    const payload = { operation: 'update', target: { skill_id: skillId, access_revision: native.reference.access_revision },
+      revision: native.settingsRevision, patch: { agent_targets: Object.fromEntries(Object.entries(targets).sort(([a], [b]) => a.localeCompare(b))) } };
+    const requestId = 'sync-settings-' + createHash('sha256').update(JSON.stringify(payload)).digest('hex');
+    const saved = await requestJson<{ receipt_id: string; skill_id: string; target: { skill_id: string }; settings: { agent_targets: AgentTargets; updated_at: string };
+      current?: { target: { skill_id: string }; settings: { agent_targets: AgentTargets; updated_at: string } } }>(`${serverUrl}/portal_skills/native-settings`, jwt,
+      { body: { ...payload, request_id: requestId } });
+    const current = saved.current || saved;
+    if (saved.skill_id !== skillId || typeof saved.receipt_id !== 'string' || !saved.receipt_id
+        || current.target?.skill_id !== skillId || !current.settings) throw new Error('Native assignment update was not confirmed.');
+    return { success: true, agent_targets: current.settings.agent_targets, updated_at: current.settings.updated_at };
+  }
   return requestJson<{ success: boolean; agent_targets: AgentTargets; updated_at?: string }>(`${serverUrl}/portal_skills/agent-targets`, jwt, {
     method: 'PATCH',
     body: {