@inneranimalmedia/agentsam-sdk 2.6.2 → 2.6.4

package/src/lib/account-session.js

@@ -147,8 +147,14 @@ export function resolveBrowserSessionCredential(options = {}) {
  */
 export function resolveAccountAuth(options = {}) {
   const apiKey = resolveAccountApiKey(options);
-  if (apiKey.value || apiKey.error) return apiKey;
-  return resolveBrowserSessionCredential(options);
+  if (apiKey.value) return apiKey;
+  if (clean(options.explicit) && apiKey.error) return apiKey;
+  const browser = resolveBrowserSessionCredential(options);
+  if (browser.value) {
+    return apiKey.error ? { ...browser, fallback_error: apiKey.error } : browser;
+  }
+  if (browser.error) return browser;
+  return apiKey.error ? apiKey : browser;
 }
 
 export function describeAccountSession(options = {}) {

package/src/lib/agent-instructions.js

@@ -6,6 +6,9 @@ import { findProjectRules } from './project-rules.js';
 export const AGENT_RUNTIME_FILENAME = 'AGENTSAM.md';
 export const AGENT_INSTRUCTION_PRECEDENCE = Object.freeze(['AGENTSAM.md', '.agentsamrules']);
 
+/** Provider/editor adapters that must redirect to AGENTSAM.md — never compiled as policy. */
+export const AGENT_INSTRUCTION_COMPAT_SHIMS = Object.freeze(['AGENTS.md', 'CLAUDE.md']);
+
 function sha256(value) {
   return `sha256:${createHash('sha256').update(value).digest('hex')}`;
 }

package/src/lib/auth.js

@@ -137,12 +137,15 @@ export async function refreshAccountSession(options = {}) {
  */
 export async function resolveAccountAuthority(options = {}) {
   const apiKey = resolveAccountApiKey(options);
-  if (apiKey.value || apiKey.error) return apiKey;
+  if (apiKey.value) return apiKey;
+  if (clean(options.explicit) && apiKey.error) return apiKey;
 
   let session = readAccountSession(options);
-  if (!session?.access_token) return { value: '', source: null, kind: null, session: null };
+  if (!session?.access_token) {
+    return apiKey.error ? apiKey : { value: '', source: null, kind: null, session: null };
+  }
 
-  if (isBrowserSessionExpired(session, options)) {
+  if (options.forceRefresh === true || isBrowserSessionExpired(session, options)) {
     if (!session.refresh_token) {
       return {
         value: '',
@@ -171,6 +174,7 @@ export async function resolveAccountAuthority(options = {}) {
     source: 'agentsam_browser_oauth',
     kind: 'browser_oauth',
     session,
+    fallback_error: apiKey.error || null,
   };
 }
 

package/src/lib/cad/blender.js

@@ -4,9 +4,11 @@ import path from 'node:path';
 import { createHash } from 'node:crypto';
 import { fileURLToPath } from 'node:url';
 import { runProcess } from '../../security/process.js';
+import { probeDockerServiceHealth, executeBlenderDocker } from './docker-executor.js';
 
 const sdkRoot = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '../../..');
-export const BLENDER_ADAPTER_PATH = path.join(sdkRoot, 'services/cad/blender/adapter.py');
+const packagedAdapter = path.join(path.dirname(fileURLToPath(import.meta.url)), 'cad/blender/adapter.py');
+export const BLENDER_ADAPTER_PATH = fs.existsSync(packagedAdapter) ? packagedAdapter : path.join(sdkRoot, 'services/cad/blender/adapter.py');
 export const BLENDER_RESULT_PREFIX = 'AGENTSAM_RESULT=';
 export const BLENDER_EXPORT_FORMATS = Object.freeze(['glb', 'stl', 'obj']);
 export const BLENDER_RECIPE_OPS = Object.freeze([
@@ -172,9 +174,46 @@ async function invokeBlender({
   runProcessImpl = runProcess,
 }) {
   const binary = discoverBlender({ blenderBin });
-  if (!binary) throw new Error('Blender is not installed or could not be discovered; use --blender-bin or AGENTSAM_BLENDER_BIN');
-  if (!fs.existsSync(BLENDER_ADAPTER_PATH)) throw new Error(`Bundled Blender adapter is missing: ${BLENDER_ADAPTER_PATH}`);
   const timeout = boundedInteger(timeoutSeconds, 120, 1, 600, 'timeout');
+
+  if (!binary || !fs.existsSync(BLENDER_ADAPTER_PATH)) {
+    try {
+      const dockerHealth = await probeDockerServiceHealth();
+      if (dockerHealth.available && dockerHealth.tools?.blender?.installed) {
+        // Forward the full operation request (recipe/scene/camera/width/height/
+        // format/objects/collection/apply_modifiers as applicable) — the
+        // docker service has no access to `request.output`'s local path, so
+        // strip it and let the container pick its own temp output path.
+        const { output: _localOutput, ...requestRest } = request || {};
+        const inputBase64 = input && fs.existsSync(input) ? fs.readFileSync(input).toString('base64') : null;
+
+        const dockerRes = await executeBlenderDocker({
+          operation,
+          request: requestRest,
+          inputBase64,
+          format: requestRest.format
+            || (operation === 'build' ? 'blend' : operation === 'render_preview' ? 'png' : 'glb'),
+          filename: request.output ? path.basename(request.output) : undefined,
+          timeoutMs: timeout * 1000,
+        });
+
+        if (request.output && dockerRes.artifactBase64) {
+          const outputPath = path.resolve(cwd, request.output);
+          fs.mkdirSync(path.dirname(outputPath), { recursive: true });
+          fs.writeFileSync(outputPath, Buffer.from(dockerRes.artifactBase64, 'base64'));
+        }
+
+        return {
+          result: dockerRes.result || { ok: true, blender_version: dockerHealth.tools.blender.version },
+          binary: `docker://${dockerHealth.service || 'agentsam-cad'}/blender`,
+          duration_ms: dockerRes.durationMs,
+          execution_lane: 'docker_service',
+        };
+      }
+    } catch {}
+
+    throw new Error('Blender is not installed or could not be discovered; use --blender-bin, AGENTSAM_BLENDER_BIN, or launch AgentSam CAD Docker service');
+  }
   const requestDir = fs.mkdtempSync(path.join(os.tmpdir(), 'agentsam-blender-'));
   const requestPath = path.join(requestDir, 'request.json');
   fs.writeFileSync(requestPath, JSON.stringify({ schema_version: 1, ...request }, null, 2), { mode: 0o600 });

package/src/lib/cad/d1-project-store.js

@@ -0,0 +1,43 @@
+import {randomUUID} from 'node:crypto';
+import {requireValidProject} from './project-contract.js';
+import {projectHash} from './project-store.js';
+// Reuses blueprint documents + immutable R2 scene snapshots. No new tables.
+// scope is supplied by the authenticated host, never by tool arguments.
+export class D1ProjectStore {
+ constructor({db,objects,bucket,scope}) {
+  if(!scope?.account_id||!scope?.workspace_id||!scope?.tenant_id||!bucket)throw new Error('authenticated_design_scope_required');
+  this.db=db;this.objects=objects;this.bucket=bucket;this.scope=scope;
+ }
+ async read(id,revision){
+  const s=this.scope;
+  const row=await this.db.prepare("SELECT * FROM designstudio_design_blueprints WHERE id=? AND tenant_id=? AND workspace_id=? AND json_extract(intent_json,'$.account_id')=?").bind(id,s.tenant_id,s.workspace_id,s.account_id).first();
+  if(!row)throw new Error('project_not_found');
+  const current=JSON.parse(row.generation_config_json||'{}').project_revision;
+  if(revision==null||revision===current){const p=JSON.parse(row.sketch_json);return {project:p,revision:current,content_hash:projectHash(p)};}
+  const snapshot=await this.db.prepare("SELECT r2_key FROM scene_snapshots WHERE project_id=? AND user_id=? AND workspace_id=? AND tenant_id=? AND version=? AND project_type='CAD_PROJECT'").bind(id,s.account_id,s.workspace_id,s.tenant_id,revision).first();
+  if(!snapshot)throw new Error('revision_not_found');
+  const object=await this.objects.get(snapshot.r2_key);if(!object)throw new Error('revision_object_missing');
+  const saved=JSON.parse(await object.text());requireValidProject(saved.project);if(saved.content_hash!==projectHash(saved.project))throw new Error('revision_digest_mismatch');return saved;
+ }
+ async save(project,expectedRevision,message='Saved project'){
+  requireValidProject(project);
+  if(!Number.isSafeInteger(expectedRevision)||expectedRevision<0)throw new Error('expected_revision_required');
+  const s=this.scope,revision=expectedRevision+1,now=Math.floor(Date.now()/1000),id='scene_'+randomUUID().replaceAll('-','');
+  const p={...structuredClone(project),version:revision,updatedAt:Date.now()};
+  const saved={project:p,revision,content_hash:projectHash(p),message,created_at:now};
+  const key='design-projects/'+encodeURIComponent(s.account_id)+'/'+encodeURIComponent(p.id)+'/'+revision+'/'+saved.content_hash+'.json';
+  await this.objects.put(key,JSON.stringify(saved),{httpMetadata:{contentType:'application/json'}});
+  const statements=[];
+  if(expectedRevision===0){
+   statements.push(this.db.prepare("INSERT INTO designstudio_design_blueprints (id,tenant_id,workspace_id,title,intent_json,sketch_json,generation_config_json,status) VALUES (?,?,?,?,?,?,?,'structured')").bind(p.id,s.tenant_id,s.workspace_id,p.name,JSON.stringify({account_id:s.account_id,contract:'cad.project.v1'}),JSON.stringify(p),JSON.stringify({project_revision:revision,content_hash:saved.content_hash})));
+  }else{
+   statements.push(this.db.prepare("UPDATE designstudio_design_blueprints SET title=?,sketch_json=?,generation_config_json=json_set(generation_config_json,'$.project_revision',?,'$.content_hash',?),updated_at=datetime('now') WHERE id=? AND tenant_id=? AND workspace_id=? AND json_extract(intent_json,'$.account_id')=? AND json_extract(generation_config_json,'$.project_revision')=?").bind(p.name,JSON.stringify(p),revision,saved.content_hash,p.id,s.tenant_id,s.workspace_id,s.account_id,expectedRevision));
+  }
+  // D1 batch is transactional; changes() guards the snapshot against a failed CAS.
+  statements.push(this.db.prepare("INSERT INTO scene_snapshots (id,workspace_id,user_id,tenant_id,name,project_type,entity_count,r2_key,r2_bucket,project_id,version,description,created_at,updated_at) SELECT ?,?,?,?,?,'CAD_PROJECT',?,?,?,?,?,?,?,? WHERE changes()=1").bind(id,s.workspace_id,s.account_id,s.tenant_id,p.name,p.walls.length+p.rooms.length+p.doors.length+p.windows.length,key,this.bucket,p.id,revision,message,now,now));
+  let results;try{results=await this.db.batch(statements);}catch(e){throw new Error('project_save_failed:'+e.message);}
+  if(results[0]?.meta?.changes!==1)throw new Error('revision_conflict');
+  return saved;
+ }
+ async restore(id,revision,expectedRevision){const row=await this.read(id,revision);return this.save(row.project,expectedRevision,'Restored revision '+revision);}
+}