@volter/supercode-teams 0.2.157 → 0.2.159

package/connector/index.mjs

@@ -514,16 +514,36 @@ export class TeamsConnector {
   }
   labelTurns(key,entries,messages){
     const labels={...this.state.turn_labels?.[key]},notes=[...(this.state.turn_notes?.[key]??[])];let found=false;
+    const annotations=source=>Object.fromEntries([['source_via',source.via],['source_principal_id',source.from?.principalId],['source_name',source.from?.name]].filter(([,item])=>typeof item==='string'&&item));
+    const identities=messages.map(message=>{
+      if(message.value?.role!=='user')return null;
+      const stamp=message.value.metadata?.timestamp,native=typeof stamp==='string'?Date.parse(stamp):NaN;
+      const at=Number.isFinite(native)?native:message.recorded_at;
+      if(!Number.isFinite(at))return null;
+      return {at,key:`turn:${hash(canonicalJson([Number.isFinite(native)?stamp:at,messageText(message.value)]))}`};
+    });
+    // Positional native keys can be reused after compaction. Upgrade a legacy
+    // label only when its dated, fully annotated row matches the prior capture.
+    const legacy=new Set(Object.keys(labels).filter(id=>!id.startsWith('turn:'))),prior=new Map();
+    const origin=this.state.origins[key];
+    if(legacy.size)for(const [index,id]of(origin?.observed_keys??[]).entries())if(legacy.has(id))prior.set(id,origin.observed_digests?.[index]);
+    messages.forEach((message,index)=>{
+      const identity=identities[index],source=labels[message.native_key];
+      if(!identity||labels[identity.key]||!source||!Number.isFinite(Date.parse(message.value.metadata?.timestamp??'')))return;
+      const value={...message.value,metadata:{...message.value.metadata,...annotations(source)}};
+      if(prior.get(message.native_key)!==hash(canonicalJson(value)))return;
+      labels[identity.key]=source;delete labels[message.native_key];found=true;
+    });
     for(const note of [...notes]){
-      const match=messages.find(message=>!labels[message.native_key]&&message.value?.role==='user'&&(message.recorded_at==null||message.recorded_at>=note.at-60000)&&messageText(message.value)===note.text);
-      if(match){labels[match.native_key]=note.source;notes.splice(notes.indexOf(note),1);found=true;}
+      const index=messages.findIndex((message,index)=>identities[index]&&!labels[identities[index].key]&&identities[index].at>=note.at-60000&&messageText(message.value)===note.text);
+      if(index>=0){labels[identities[index].key]=note.source;notes.splice(notes.indexOf(note),1);found=true;}
     }
     if(found){(this.state.turn_labels??={})[key]=labels;if(notes.length)this.state.turn_notes[key]=notes;else delete this.state.turn_notes[key];this.save();}
     messages.forEach((message,index)=>{
-      const source=labels[message.native_key];if(!source)return;
-      const annotations=Object.fromEntries([['source_via',source.via],['source_principal_id',source.from?.principalId],['source_name',source.from?.name]].filter(([,item])=>typeof item==='string'&&item));
-      message.value={...message.value,metadata:{...message.value.metadata,...annotations}};
-      const entry=entries[index];if(entry.value)entry.value={...entry.value,metadata:{...entry.value.metadata,...annotations}};else entry.metadata={...entry.metadata,...annotations};
+      const identity=identities[index],source=identity&&labels[identity.key];if(!source)return;
+      const value=annotations(source);
+      message.value={...message.value,metadata:{...message.value.metadata,...value}};
+      const entry=entries[index];if(entry.value)entry.value={...entry.value,metadata:{...entry.value.metadata,...value}};else entry.metadata={...entry.metadata,...value};
     });
   }
   /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@volter/supercode-teams",
-  "version": "0.2.157",
+  "version": "0.2.159",
   "type": "module",
   "description": "A machine daemon serving this machine's doors, and a local or remote Teams server for shared session discovery, OpenTelemetry ingestion and access to enrolled machines.",
   "license": "MIT",

package/terminal-mail.mjs

@@ -14,6 +14,7 @@ function confirmed(batch) {
     let offset = batch.offset, buffered = '';
     const decoder = new StringDecoder('utf8');
     const bytes = Buffer.alloc(64 * 1024);
+    let matched = 0, fragments = 0;
     for (;;) {
       const count = readSync(fd, bytes, 0, bytes.length, offset);
       if (!count) return false;
@@ -24,7 +25,22 @@ function confirmed(batch) {
         let row; try { row = JSON.parse(line); } catch { continue; }
         const content = batch.kind === 'codex' && row.type === 'response_item' && row.payload?.type === 'message' && row.payload.role === 'user'
           ? row.payload.content : batch.kind === 'grok' && row.type === 'user' ? row.content : null;
-        if (textOf(content) === batch.text) return true;
+        const text = textOf(content);
+        if (text === null || text.length === 0) continue;
+        if (text === batch.text) return { fragments: 1 };
+        // Older mail delivery omitted the paste delimiter, so terminal newlines
+        // submitted one envelope as several native user messages. Recover only
+        // exact, ordered fragments of the retained bytes, separated by original
+        // newlines. Never infer delivery from an id, substring or empty composer.
+        let next = matched;
+        while (next < batch.text.length && batch.text[next] === '\n') next++;
+        if (matched && batch.text.startsWith(text, next)) {
+          matched = next + text.length; fragments++;
+        } else if (batch.text.startsWith(text)) {
+          matched = text.length; fragments = 1;
+        } else { matched = 0; fragments = 0; }
+        if (matched === batch.text.length) return { fragments };
+
       }
     }
   } finally { closeSync(fd); }
@@ -50,7 +66,7 @@ export class TerminalMailbox {
     const delivered = ids.every(id => this.state.receipts.some(r => r.message_ids.includes(id)));
     const batch = this.state.active;
     return { delivered, queued: !delivered, message_ids: ids,
-      ...(delivered ? { receipt: 'native-user-message' } : { reason: batch?.error ?? 'queued', batch: batch?.id ?? null }) };
+      ...(delivered ? { receipt: this.state.receipts.some(r => r.receipt === 'native-user-messages' && r.message_ids.some(id => ids.includes(id))) ? 'native-user-messages' : 'native-user-message' } : { reason: batch?.error ?? 'queued', batch: batch?.id ?? null }) };
   }
   enqueue(text, ids, identity, host, session) {
     const messageIds = ids?.length ? ids : [`input-${randomUUID()}`];
@@ -95,7 +111,7 @@ export class TerminalMailbox {
     if (!batch) return;
     const seen = batch.offset !== null ? confirmed(batch) : (await this.load(batch.locator, { message_offset: batch.messageOffset, message_limit: 1000 })).session?.messages?.some(message => message.role === 'user' && textOf(message.content) === batch.text);
     if (seen) {
-      const receipt = { batch: batch.id, message_ids: batch.message_ids, delivered: true, receipt: 'native-user-message', at: Date.now() };
+      const receipt = { batch: batch.id, message_ids: batch.message_ids, delivered: true, receipt: seen.fragments > 1 ? 'native-user-messages' : 'native-user-message', fragments: seen.fragments ?? 1, at: Date.now() };
       appendFileSync(join(this.dir, 'receipts.jsonl'), JSON.stringify(receipt) + '\n', { mode: 0o600 });
       this.state.receipts.push(receipt);
       this.state.active = null; this.save(); this.log(receipt); return;
@@ -104,7 +120,9 @@ export class TerminalMailbox {
       // Persist uncertainty before I/O. A daemon restart checks the transcript;
       // it never guesses that an unacknowledged paste did not happen.
       batch.phase = 'paste_started'; this.save();
-      await this.host.sendInput(this.session.id, batch.text, { submitMode: 'none' });
+      // The terminal host's final newline selects one bracketed paste;
+      // submitMode:none holds the separate Enter until the paste completes.
+      await this.host.sendInput(this.session.id, `${batch.text}\n`, { submitMode: 'none' });
       batch.phase = 'pasted'; this.save();
     }
     if (batch.phase === 'paste_started') {