@notis_ai/cli 0.2.0-beta.161.1 → 0.2.0-beta.164.1

package/dist/agent-hooks/notis-agent-hook.mjs

@@ -1355,7 +1355,7 @@ function connectedCallbackHtml({ portalOrigin }) {
           <button class="button button-primary" id="download-desktop" type="button">Download Notis Desktop</button>
           <a class="button" href="${escapeHtml(webAppUrl)}">Open Web App</a>
         </div>
-        <p class="helper">The CLI stays connected even if you continue in the web app.</p>
+        <p class="helper">Desktop is available for macOS and Windows. The CLI stays connected even if you continue in the web app.</p>
       </section>
       <section class="next-step" id="desktop-ready-view" aria-labelledby="desktop-ready-title" hidden>
         <div class="status"><span class="status-dot"></span> Download started</div>
@@ -1381,7 +1381,6 @@ function connectedCallbackHtml({ portalOrigin }) {
         const resolveDownload = async () => {
           const ua = navigator.userAgent || '';
           if (/Windows/i.test(ua)) return downloads.base + '/win32/x64/notis-x64.exe';
-          if (/Linux/i.test(ua) && !/Android/i.test(ua)) return downloads.base + '/linux/x64/notis-linux-x64.zip';
           if (/Macintosh|Mac OS X/i.test(ua)) {
             let architecture = '';
             try {
@@ -1398,6 +1397,7 @@ function connectedCallbackHtml({ portalOrigin }) {
         const startDownload = async () => {
           const downloadUrl = await resolveDownload();
           window.open(downloadUrl, '_blank', 'noopener,noreferrer');
+          if (downloadUrl === downloads.fallback) return;
           connectedView.hidden = true;
           readyView.hidden = false;
           document.title = 'Quick login to Notis Desktop';
@@ -4140,11 +4140,24 @@ async function syncSymlinks(skills, skillsDir = LEGACY_AGENTS_SKILLS_DIR, option
   }
   return result;
 }
-function getPushCandidates(localSkills, syncState, cloudCuratedSkillNames = /* @__PURE__ */ new Set(), cloudSkillNames) {
+function selectCloudSkillsToApply(skills) {
+  const winners = /* @__PURE__ */ new Map();
+  for (const skill of skills) {
+    const current = winners.get(skill.name);
+    if (!current || (skill.updated_at || "") >= (current.updated_at || "")) {
+      winners.set(skill.name, skill);
+    }
+  }
+  return [...winners.values()];
+}
+function getPushCandidates(localSkills, syncState, cloudCuratedSkillNames = /* @__PURE__ */ new Set(), cloudSkillNames, cloudAppOwnedSkillNames = /* @__PURE__ */ new Set()) {
   return localSkills.filter((skill) => {
     if (cloudCuratedSkillNames.has(skill.name)) {
       return false;
     }
+    if (cloudAppOwnedSkillNames.has(skill.name)) {
+      return false;
+    }
     const previous = syncState.skills[skill.name];
     if (!previous) {
       return true;
@@ -4238,17 +4251,28 @@ function shouldWriteCloudSkill(cloudSkill, localSkills, previousState) {
   }
   const previous = previousState.skills[skillName];
   if (previous?.folderHash === localSkill.folderHash && previous.cloudContentHash === cloudContentHash(cloudSkill)) return false;
+  if (previous && previous.cloudContentHash === void 0 && previous.cloudId === cloudSkill.id && previous.appliedCloudFolderHash !== void 0 && previous.appliedCloudFolderHash === cloudHash && previous.cloudUpdatedAt === cloudSkill.updated_at && previous.folderHash === localSkill.folderHash) {
+    return false;
+  }
   if (cloudSkill.source === "curated") {
     return cloudHash ? cloudHash !== localSkill.folderHash : true;
   }
   const localChangedSinceLastSync = !previous || previous.folderHash !== localSkill.folderHash;
   return !localChangedSinceLastSync && (Boolean(cloudHash) && cloudHash !== localSkill.folderHash || Boolean(previous?.cloudContentHash && previous.cloudContentHash !== cloudContentHash(cloudSkill)));
 }
-function buildSyncState(pullResponse, localSkills, lastSyncedAt, verifiedAgentLinks = {}, failedContentNames = /* @__PURE__ */ new Set()) {
+function collectAppliedCloudRevisions(pullResponse, previousState, writtenSkillNames) {
+  const applied = {};
+  for (const skill of selectCloudSkillsToApply(pullResponse.skills)) {
+    applied[skill.name] = writtenSkillNames.has(skill.name) ? skill.skill_folder_hash || "" : previousState.skills[skill.name]?.appliedCloudFolderHash;
+  }
+  return applied;
+}
+function buildSyncState(pullResponse, localSkills, lastSyncedAt, verifiedAgentLinks = {}, failedContentNames = /* @__PURE__ */ new Set(), appliedRevisions = {}) {
   const localSkillMap = toSkillMap(localSkills);
   const skills = Object.fromEntries(
-    pullResponse.skills.map((skill) => {
+    selectCloudSkillsToApply(pullResponse.skills).map((skill) => {
       const localSkill = localSkillMap.get(skill.name);
+      const appliedCloudFolderHash = appliedRevisions[skill.name];
       return [
         skill.name,
         {
@@ -4258,6 +4282,7 @@ function buildSyncState(pullResponse, localSkills, lastSyncedAt, verifiedAgentLi
           verifiedAgentLinks: skill.status === "active" ? verifiedAgentLinks[skill.name] ?? {} : {},
           cloudUpdatedAt: skill.updated_at,
           ...!failedContentNames.has(skill.name) && !skill.skill_source_url ? { cloudContentHash: cloudContentHash(skill) } : {},
+          ...appliedCloudFolderHash !== void 0 ? { appliedCloudFolderHash } : {},
           syncedAt: lastSyncedAt || (/* @__PURE__ */ new Date()).toISOString()
         }
       ];
@@ -4319,7 +4344,7 @@ async function writePulledSkillsToScopedMirror(pullResponse, localSkills, previo
     console.warn(`[Notis] ${message}`, error);
   };
   let downloaded = 0;
-  for (const cloudSkill of pullResponse.skills) {
+  for (const cloudSkill of selectCloudSkillsToApply(pullResponse.skills)) {
     if (!shouldWriteCloudSkill(cloudSkill, localSkillMap, previousState)) {
       continue;
     }
@@ -4400,7 +4425,8 @@ async function materializeCloudSkillsForLocalShell(serverUrl, jwt, dependencies
     finalLocalSkills,
     lastSyncedAt,
     verifiedLinks,
-    new Set(failedDownloads.map((item) => item.name))
+    new Set(failedDownloads.map((item) => item.name)),
+    collectAppliedCloudRevisions(pullResponse, previousState, writtenSkillNames)
   );
   for (const [name, entry] of Object.entries(materializedState.skills)) {
     if (writtenSkillNames.has(name)) continue;
@@ -4555,7 +4581,8 @@ async function runSkillSync(serverUrl, jwt, dependencies = {}, options = {}) {
     localSkills,
     previousState,
     cloudCuratedSkillNames,
-    new Set(pullResponse.skills.map((skill) => skill.name))
+    new Set(pullResponse.skills.map((skill) => skill.name)),
+    new Set(pullResponse.skills.filter((skill) => skill.owner_app_id).map((skill) => skill.name))
   );
   const failedPushes = [];
   if (pushCandidates.length > 0) {
@@ -4579,13 +4606,15 @@ async function runSkillSync(serverUrl, jwt, dependencies = {}, options = {}) {
     }
   }
   const failedDownloads = [];
+  const writtenSkillNames = /* @__PURE__ */ new Set();
   const downloaded = await writePulledSkillsToScopedMirror(
     pullResponse,
     localSkills,
     previousState,
     syncPaths,
     deps,
-    failedDownloads
+    failedDownloads,
+    writtenSkillNames
   );
   const finalLocalSkills = (await deps.scanLocalSkills(syncPaths)).filter((skill) => !BASE_SKILL_NAMES2.has(skill.name));
   const symlinkResult = await deps.syncSymlinks(
@@ -4596,7 +4625,14 @@ async function runSkillSync(serverUrl, jwt, dependencies = {}, options = {}) {
   for (const failure of failedDownloads) delete verifiedLinks[failure.name];
   const lastSyncedAt = pullResponse.last_synced_at || (/* @__PURE__ */ new Date()).toISOString();
   await deps.writeSyncState(
-    buildSyncState(pullResponse, finalLocalSkills, lastSyncedAt, verifiedLinks, new Set(failedDownloads.map((item) => item.name))),
+    buildSyncState(
+      pullResponse,
+      finalLocalSkills,
+      lastSyncedAt,
+      verifiedLinks,
+      new Set(failedDownloads.map((item) => item.name)),
+      collectAppliedCloudRevisions(pullResponse, previousState, writtenSkillNames)
+    ),
     syncPaths
   );
   return {
@@ -9027,7 +9063,7 @@ function resolveBuiltBundleDir(projectDir) {
   return null;
 }
 function normalizeShadowScopedCss(css) {
-  return css.replace(/html\s*,\s*:host\s*\{/g, ":host{").replace(/:root\s*,\s*:host\s*\{/g, ":host{").replace(/:root\s*\{/g, ":host{").replace(/html\s*\{/g, ":host{").replace(/body\s*\{/g, "[data-notis-app-root]{");
+  return css.replace(/(?:html|:root)\s*,\s*:host\s*\{/g, "[data-notis-app-root],:host{").replace(/:root\s*\{/g, "[data-notis-app-root],:host{").replace(/html\s*\{/g, "[data-notis-app-root],:host{").replace(/body\s*\{/g, "[data-notis-app-root]{");
 }
 function normalizeBundleStylesheets(projectDir) {
   const bundleDir = join4(projectDir, BUNDLE_DIR);

package/dist/base-skills/notis-cli/SKILL.md

@@ -1,7 +1,6 @@
 ---
 name: notis-cli
 description: Use when agents should work through the Notis CLI, especially to develop Notis apps locally or to access Notis, Composio, or MCP tools they do not currently have loaded directly.
-feature_flag: cli_access
 mcp_resource: true
 mcp_tool_patterns: []
 mcp_references: ["references/app-delivery.md", "references/tool-examples.md", "references/native-databases.md", "references/troubleshooting.md"]

package/dist/skill-sync/index.js

@@ -1118,11 +1118,24 @@ async function syncSymlinks(skills, skillsDir = LEGACY_AGENTS_SKILLS_DIR, option
 }
 
 // src/runtime/skill-sync/sync-plan.ts
-function getPushCandidates(localSkills, syncState, cloudCuratedSkillNames = /* @__PURE__ */ new Set(), cloudSkillNames) {
+function selectCloudSkillsToApply(skills) {
+  const winners = /* @__PURE__ */ new Map();
+  for (const skill of skills) {
+    const current = winners.get(skill.name);
+    if (!current || (skill.updated_at || "") >= (current.updated_at || "")) {
+      winners.set(skill.name, skill);
+    }
+  }
+  return [...winners.values()];
+}
+function getPushCandidates(localSkills, syncState, cloudCuratedSkillNames = /* @__PURE__ */ new Set(), cloudSkillNames, cloudAppOwnedSkillNames = /* @__PURE__ */ new Set()) {
   return localSkills.filter((skill) => {
     if (cloudCuratedSkillNames.has(skill.name)) {
       return false;
     }
+    if (cloudAppOwnedSkillNames.has(skill.name)) {
+      return false;
+    }
     const previous = syncState.skills[skill.name];
     if (!previous) {
       return true;
@@ -1239,17 +1252,28 @@ function shouldWriteCloudSkill(cloudSkill, localSkills, previousState) {
   }
   const previous = previousState.skills[skillName];
   if (previous?.folderHash === localSkill.folderHash && previous.cloudContentHash === cloudContentHash(cloudSkill)) return false;
+  if (previous && previous.cloudContentHash === void 0 && previous.cloudId === cloudSkill.id && previous.appliedCloudFolderHash !== void 0 && previous.appliedCloudFolderHash === cloudHash && previous.cloudUpdatedAt === cloudSkill.updated_at && previous.folderHash === localSkill.folderHash) {
+    return false;
+  }
   if (cloudSkill.source === "curated") {
     return cloudHash ? cloudHash !== localSkill.folderHash : true;
   }
   const localChangedSinceLastSync = !previous || previous.folderHash !== localSkill.folderHash;
   return !localChangedSinceLastSync && (Boolean(cloudHash) && cloudHash !== localSkill.folderHash || Boolean(previous?.cloudContentHash && previous.cloudContentHash !== cloudContentHash(cloudSkill)));
 }
-function buildSyncState(pullResponse, localSkills, lastSyncedAt, verifiedAgentLinks = {}, failedContentNames = /* @__PURE__ */ new Set()) {
+function collectAppliedCloudRevisions(pullResponse, previousState, writtenSkillNames) {
+  const applied = {};
+  for (const skill of selectCloudSkillsToApply(pullResponse.skills)) {
+    applied[skill.name] = writtenSkillNames.has(skill.name) ? skill.skill_folder_hash || "" : previousState.skills[skill.name]?.appliedCloudFolderHash;
+  }
+  return applied;
+}
+function buildSyncState(pullResponse, localSkills, lastSyncedAt, verifiedAgentLinks = {}, failedContentNames = /* @__PURE__ */ new Set(), appliedRevisions = {}) {
   const localSkillMap = toSkillMap(localSkills);
   const skills = Object.fromEntries(
-    pullResponse.skills.map((skill) => {
+    selectCloudSkillsToApply(pullResponse.skills).map((skill) => {
       const localSkill = localSkillMap.get(skill.name);
+      const appliedCloudFolderHash = appliedRevisions[skill.name];
       return [
         skill.name,
         {
@@ -1259,6 +1283,7 @@ function buildSyncState(pullResponse, localSkills, lastSyncedAt, verifiedAgentLi
           verifiedAgentLinks: skill.status === "active" ? verifiedAgentLinks[skill.name] ?? {} : {},
           cloudUpdatedAt: skill.updated_at,
           ...!failedContentNames.has(skill.name) && !skill.skill_source_url ? { cloudContentHash: cloudContentHash(skill) } : {},
+          ...appliedCloudFolderHash !== void 0 ? { appliedCloudFolderHash } : {},
           syncedAt: lastSyncedAt || (/* @__PURE__ */ new Date()).toISOString()
         }
       ];
@@ -1320,7 +1345,7 @@ async function writePulledSkillsToScopedMirror(pullResponse, localSkills, previo
     console.warn(`[Notis] ${message}`, error);
   };
   let downloaded = 0;
-  for (const cloudSkill of pullResponse.skills) {
+  for (const cloudSkill of selectCloudSkillsToApply(pullResponse.skills)) {
     if (!shouldWriteCloudSkill(cloudSkill, localSkillMap, previousState)) {
       continue;
     }
@@ -1401,7 +1426,8 @@ async function materializeCloudSkillsForLocalShell(serverUrl, jwt, dependencies
     finalLocalSkills,
     lastSyncedAt,
     verifiedLinks,
-    new Set(failedDownloads.map((item) => item.name))
+    new Set(failedDownloads.map((item) => item.name)),
+    collectAppliedCloudRevisions(pullResponse, previousState, writtenSkillNames)
   );
   for (const [name, entry] of Object.entries(materializedState.skills)) {
     if (writtenSkillNames.has(name)) continue;
@@ -1556,7 +1582,8 @@ async function runSkillSync(serverUrl, jwt, dependencies = {}, options = {}) {
     localSkills,
     previousState,
     cloudCuratedSkillNames,
-    new Set(pullResponse.skills.map((skill) => skill.name))
+    new Set(pullResponse.skills.map((skill) => skill.name)),
+    new Set(pullResponse.skills.filter((skill) => skill.owner_app_id).map((skill) => skill.name))
   );
   const failedPushes = [];
   if (pushCandidates.length > 0) {
@@ -1580,13 +1607,15 @@ async function runSkillSync(serverUrl, jwt, dependencies = {}, options = {}) {
     }
   }
   const failedDownloads = [];
+  const writtenSkillNames = /* @__PURE__ */ new Set();
   const downloaded = await writePulledSkillsToScopedMirror(
     pullResponse,
     localSkills,
     previousState,
     syncPaths,
     deps,
-    failedDownloads
+    failedDownloads,
+    writtenSkillNames
   );
   const finalLocalSkills = (await deps.scanLocalSkills(syncPaths)).filter((skill) => !BASE_SKILL_NAMES.has(skill.name));
   const symlinkResult = await deps.syncSymlinks(
@@ -1597,7 +1626,14 @@ async function runSkillSync(serverUrl, jwt, dependencies = {}, options = {}) {
   for (const failure of failedDownloads) delete verifiedLinks[failure.name];
   const lastSyncedAt = pullResponse.last_synced_at || (/* @__PURE__ */ new Date()).toISOString();
   await deps.writeSyncState(
-    buildSyncState(pullResponse, finalLocalSkills, lastSyncedAt, verifiedLinks, new Set(failedDownloads.map((item) => item.name))),
+    buildSyncState(
+      pullResponse,
+      finalLocalSkills,
+      lastSyncedAt,
+      verifiedLinks,
+      new Set(failedDownloads.map((item) => item.name)),
+      collectAppliedCloudRevisions(pullResponse, previousState, writtenSkillNames)
+    ),
     syncPaths
   );
   return {