@drawcall/market 0.1.25 → 0.1.27

package/src/resolve.ts

@@ -2,9 +2,10 @@
  * Dependency resolver for market assets.
  *
  * 1. Collects the target assets and all transitive asset dependencies.
- * 2. For each asset, finds a version that satisfies ALL constraints from
- *    every dependent.
- * 3. Merges npm dependency ranges across all resolved assets and checks
+ * 2. For each asset, takes the latest published version and verifies it
+ *    satisfies ALL constraints from every dependent. (Only the latest
+ *    version is resolved; older versions are not considered.)
+ * 3. Intersects npm dependency ranges across all resolved assets and checks
  *    that they are compatible.
  */
 
@@ -58,24 +59,26 @@ export async function resolve(
       }
 
       if (!opts.includeUnapproved && !meta.approved) {
-        throw new ResolutionError(
-          `Asset "${assetName}" has no ${opts.includeUnapproved ? '' : 'approved '}versions.`,
-        )
+        throw new ResolutionError(`Asset "${assetName}" has no approved versions.`)
       }
 
+      // The market publishes immutable versions and resolution targets the
+      // latest published version of each asset. A range that excludes the
+      // latest version is therefore unsatisfiable (older versions are not
+      // resolved), which this message makes explicit.
       const assetConstraints = constraints.get(assetName) ?? []
       if (!assetConstraints.every((c) => semver.satisfies(meta.latestVersion, c.range))) {
         const constraintDesc = assetConstraints
           .map((c) => `  ${c.range} (from ${c.from})`)
           .join('\n')
         throw new ResolutionError(
-          `No version of "${assetName}" satisfies all constraints:\n${constraintDesc}\n` +
-            `Available${opts.includeUnapproved ? '' : ' approved'}: ${meta.latestVersion}`,
+          `The latest${opts.includeUnapproved ? '' : ' approved'} version of "${assetName}" ` +
+            `(${meta.latestVersion}) does not satisfy all constraints:\n${constraintDesc}`,
         )
       }
 
-      const npmDeps: Record<string, string> = JSON.parse(meta.npmDependencies)
-      const assetDeps: Record<string, string> = JSON.parse(meta.assetDependencies)
+      const npmDeps = parseDependencies(meta.npmDependencies, assetName, 'npm')
+      const assetDeps = parseDependencies(meta.assetDependencies, assetName, 'asset')
 
       resolved.set(assetName, {
         name: assetName,
@@ -115,6 +118,22 @@ export async function resolve(
   }
 }
 
+function parseDependencies(
+  value: string,
+  assetName: string,
+  kind: 'npm' | 'asset',
+): Record<string, string> {
+  try {
+    const parsed = JSON.parse(value || '{}') as unknown
+    if (parsed && typeof parsed === 'object' && !Array.isArray(parsed)) {
+      return parsed as Record<string, string>
+    }
+  } catch {
+    // fall through to a clear error below
+  }
+  throw new ResolutionError(`Asset "${assetName}" has malformed ${kind} dependency metadata.`)
+}
+
 function addConstraint(
   constraints: Map<string, { range: string; from: string }[]>,
   name: string,
@@ -151,7 +170,8 @@ async function fetchMeta(
 /**
  * Merge npm dependency ranges from all resolved assets.
  * For each package, check that all declared ranges are compatible
- * (using semver.intersects). Return the narrowest range.
+ * (using semver.intersects), then return the single declared range that is a
+ * subset of every other — the true intersection.
  */
 function mergeNpmDependencies(assets: ResolvedAsset[]): Record<string, string> {
   // Collect all ranges per package
@@ -181,18 +201,23 @@ function mergeNpmDependencies(assets: ResolvedAsset[]): Record<string, string> {
       }
     }
 
-    // Use the narrowest (most constrained) range.
-    // Simple heuristic: pick the range with the highest minimum version.
-    let narrowest = ranges[0].range
-    for (const r of ranges.slice(1)) {
-      const minCurrent = semver.minVersion(narrowest)
-      const minNew = semver.minVersion(r.range)
-      if (minCurrent && minNew && semver.gt(minNew, minCurrent)) {
-        narrowest = r.range
-      }
+    // Use the single declared range that is contained in every other declared
+    // range — the true intersection of all constraints. Picking by "highest
+    // minimum version" is unsound: a range with a higher minimum can also have
+    // a higher (or open) upper bound, silently dropping another dependent's
+    // upper bound. If no single range represents the intersection, it cannot be
+    // expressed as one package.json range, so fail loudly.
+    const narrowest = ranges.find((candidate) =>
+      ranges.every((other) => semver.subset(candidate.range, other.range)),
+    )
+    if (!narrowest) {
+      throw new ResolutionError(
+        `npm dependency ranges for "${pkg}" overlap but cannot be combined into a single range:\n` +
+          ranges.map((r) => `  ${r.range} (from ${r.from})`).join('\n'),
+      )
     }
 
-    merged[pkg] = narrowest
+    merged[pkg] = narrowest.range
   }
 
   return merged

package/src/skill.ts

@@ -5,36 +5,40 @@ description: Find, preview, install, generate, and publish Drawcall Market asset
 
 # Drawcall Market
 
-Use the \`market\` CLI. Keep commands short and read the summary line plus asset bullets.
+Use the \`market\` CLI. Keep commands short and read the summary lines.
 
 ## Quick Start
 
 \`\`\`sh
 market search "wooden chair" --type model --limit 3
-market install wooden-chair --type model --cwd "$PWD"
+market install wooden-chair --cwd "$PWD"
 market preview wooden-chair --out /tmp/wooden-chair.png
 \`\`\`
 
 ## Workflow
 
-1. Search first unless the user gave an exact asset name.
-2. Search requires \`--type\`; use \`model\` unless the user names another supported type: \`humanoid-model\`, \`texture\`, \`humanoid-animation\`, \`template\`, \`sound-effect\`, \`background-music\`, or \`environment\`.
-3. Use \`--limit 1\` for lookup, \`--limit 3\` for choice. Search caps at 5.
-4. Use \`--verbose\` only when the one-line descriptions are not enough.
+1. Search first unless the user already gave an exact asset name. \`search\` requires \`--type\`; use \`model\` unless the user names another supported type: \`humanoid-model\`, \`texture\`, \`humanoid-animation\`, \`template\`, \`sound-effect\`, \`background-music\`, or \`environment\`.
+2. Use \`--limit 1\` for lookup, \`--limit 3\` for choice. Search caps at 5. Add \`--verbose\` only when the one-line descriptions are not enough.
+3. \`install\` takes one or more exact asset names (optionally \`name@range\`); it does not search or generate. Find names with \`search\` first. No \`--type\` is needed — asset names are unique.
+4. \`preview <name>\` saves the preview image; no \`--type\` is needed. Not every type has previews (e.g. \`humanoid-animation\`, \`template\`, \`sound-effect\`, \`background-music\`); the CLI reports when one is unavailable.
 5. Use \`--unapproved\` only when the user asks for unapproved/private/admin assets. Do not install unapproved assets without explicit acceptance.
-6. Preview before installing when visual fit matters: \`market preview <name> --out <file>\`. Preview is not supported for \`humanoid-animation\`, \`template\`, \`sound-effect\`, or \`background-music\`.
-7. Generate only when the user wants a new asset, auth is available, and the requested asset type supports generation. No asset type currently supports generation.
-8. Upload only when publishing is requested.
-9. Installed \`environment\` assets contain \`public/environment/<name>.hdr\` for Three.js IBL lighting and \`public/environment/<name>-background.webp\` for the visible equirectangular background. Use \`market preview\` to fetch the preview image separately.
+6. \`generate --type <type> "<prompt>"\` creates a new asset; it requires login and a type that supports generation. No asset type currently supports generation.
+7. Upload only when publishing is requested: \`market upload <name> <zip> "<description>" --type <type>\`.
+8. Installed \`environment\` assets contain \`public/environment/<name>.hdr\` for Three.js IBL lighting and \`public/environment/<name>-background.webp\` for the visible equirectangular background. Use \`market preview\` to fetch the preview image separately.
 
 ## Output
 
-Commands print concise summaries:
+Commands print concise, line-oriented summaries:
 
 \`\`\`text
 Results: 2/8 query="wooden chair" type=model approval=approved
 - wooden-chair@1.0.0 | model | approved | Low-poly wooden chair
-Installed 1 asset: wooden-chair@1.0.0
+Installed:
+- wooden-chair@1.0.0 (asset)
+  files:
+    public/model
+    └─ wooden-chair.glb
+- three@^0.178.0 (npm)
 Saved preview for wooden-chair@1.0.0: /tmp/wooden-chair.png
 \`\`\`
 

package/tests/install-command.test.ts

@@ -2,17 +2,10 @@ import assert from 'node:assert/strict'
 import test from 'node:test'
 import { resolveArg } from '../src/commands/install.js'
 
-test('resolveArg reports unapproved explicit assets instead of falling through to generation', async () => {
-  let searchCalls = 0
+test('resolveArg reports unapproved explicit assets clearly', async () => {
   const client = {
     asset: {
-      exact: async ({
-        includeUnapproved,
-      }: {
-        name: string
-        type?: string
-        includeUnapproved: boolean
-      }) =>
+      exact: async ({ includeUnapproved }: { name: string; includeUnapproved: boolean }) =>
         includeUnapproved
           ? {
               name: 'qwantani-moon-noon-puresky',
@@ -20,59 +13,33 @@ test('resolveArg reports unapproved explicit assets instead of falling through t
               approved: false,
             }
           : null,
-      search: async () => {
-        searchCalls += 1
-        return { items: [], total: 0, page: 1, limit: 1, totalPages: 0 }
-      },
     },
   } as never
 
   await assert.rejects(
-    resolveArg(
-      client,
-      'qwantani-moon-noon-puresky@1.0.2',
-      'environment',
-      silentSpinner(),
-      true,
-      false,
-    ),
+    resolveArg(client, 'qwantani-moon-noon-puresky@1.0.2', false),
     /has no approved versions/u,
   )
-
-  assert.equal(searchCalls, 0)
 })
 
-test('resolveArg keeps explicit versioned asset refs exact when nothing matches yet', async () => {
-  let searchCalls = 0
+test('resolveArg keeps explicit versioned refs exact when the asset exists', async () => {
   const client = {
     asset: {
-      exact: async () => null,
-      search: async () => {
-        searchCalls += 1
-        return { items: [], total: 0, page: 1, limit: 1, totalPages: 0 }
-      },
+      exact: async () => ({ name: 'fresh-sky', latestVersion: '1.2.3', approved: true }),
     },
   } as never
 
-  const request = await resolveArg(
-    client,
-    'fresh-sky@1.2.3',
-    'environment',
-    silentSpinner(),
-    true,
-    false,
-  )
+  const request = await resolveArg(client, 'fresh-sky@1.2.3', false)
 
   assert.deepEqual(request, { name: 'fresh-sky', range: '1.2.3' })
-  assert.equal(searchCalls, 0)
 })
 
-function silentSpinner() {
-  return {
-    text: '',
-    info() {},
-    start() {
-      return this
+test('resolveArg errors when the asset does not exist instead of deferring', async () => {
+  const client = {
+    asset: {
+      exact: async () => null,
     },
   } as never
-}
+
+  await assert.rejects(resolveArg(client, 'does-not-exist@1.2.3', false), /not found/u)
+})