@zhigang1992/happy-cli 0.12.1 → 0.12.4

package/dist/lib.d.cts

@@ -291,6 +291,16 @@ type RawJSONLines = z.infer<typeof RawJSONLinesSchema>;
 /**
  * Common RPC types and interfaces for both session and machine clients
  */
+/**
+ * Session context for RPC handlers
+ * Contains environment and path information for the current session
+ */
+interface RpcSessionContext {
+    /** Working directory path for the session */
+    path: string;
+    /** Environment variables (includes direnv if available) */
+    env: Record<string, string>;
+}
 /**
  * Generic RPC handler function type
  * @template TRequest - The request data type
@@ -326,7 +336,19 @@ declare class RpcHandlerManager {
     private readonly encryptionVariant;
     private readonly logger;
     private socket;
+    private sessionContext;
     constructor(config: RpcHandlerConfig);
+    /**
+     * Set the session context (path and environment)
+     * This should be called after direnv environment is loaded
+     * @param context - The session context with path and environment
+     */
+    setSessionContext(context: RpcSessionContext): void;
+    /**
+     * Get the current session context
+     * @returns The session context or null if not set
+     */
+    getSessionContext(): RpcSessionContext | null;
     /**
      * Register an RPC handler for a specific method
      * @param method - The method name (without prefix)
@@ -423,6 +445,30 @@ declare class ApiSessionClient extends EventEmitter {
      */
     flush(): Promise<void>;
     close(): Promise<void>;
+    /**
+     * Download and decrypt a blob from the server
+     * @param blobId - The blob ID to download
+     * @returns The decrypted binary data and metadata, or null if download/decryption fails
+     */
+    downloadBlob(blobId: string): Promise<{
+        data: Uint8Array;
+        mimeType: string;
+        size: number;
+    } | null>;
+    /**
+     * Convert an image_ref content block to a Claude API image content block
+     * Downloads, decrypts, and base64 encodes the image
+     * @param imageRef - The image reference content block
+     * @returns Claude API image content block, or null if conversion fails
+     */
+    resolveImageRef(imageRef: ImageRefContent): Promise<{
+        type: 'image';
+        source: {
+            type: 'base64';
+            media_type: string;
+            data: string;
+        };
+    } | null>;
 }
 
 type PermissionMode = 'default' | 'acceptEdits' | 'bypassPermissions' | 'plan';
@@ -505,9 +551,32 @@ type Machine = {
     daemonState: DaemonState | null;
     daemonStateVersion: number;
 };
+/**
+ * Image reference content block for user messages (E2E encrypted images)
+ */
+declare const ImageRefContentSchema: z.ZodObject<{
+    type: z.ZodLiteral<"image_ref">;
+    blobId: z.ZodString;
+    mimeType: z.ZodEnum<["image/jpeg", "image/png", "image/gif", "image/webp"]>;
+    width: z.ZodOptional<z.ZodNumber>;
+    height: z.ZodOptional<z.ZodNumber>;
+}, "strip", z.ZodTypeAny, {
+    type: "image_ref";
+    blobId: string;
+    mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+    width?: number | undefined;
+    height?: number | undefined;
+}, {
+    type: "image_ref";
+    blobId: string;
+    mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+    width?: number | undefined;
+    height?: number | undefined;
+}>;
+type ImageRefContent = z.infer<typeof ImageRefContentSchema>;
 declare const UserMessageSchema: z.ZodObject<{
     role: z.ZodLiteral<"user">;
-    content: z.ZodObject<{
+    content: z.ZodUnion<[z.ZodObject<{
         type: z.ZodLiteral<"text">;
         text: z.ZodString;
     }, "strip", z.ZodTypeAny, {
@@ -516,7 +585,34 @@ declare const UserMessageSchema: z.ZodObject<{
     }, {
         type: "text";
         text: string;
-    }>;
+    }>, z.ZodArray<z.ZodUnion<[z.ZodObject<{
+        type: z.ZodLiteral<"text">;
+        text: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        type: "text";
+        text: string;
+    }, {
+        type: "text";
+        text: string;
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"image_ref">;
+        blobId: z.ZodString;
+        mimeType: z.ZodEnum<["image/jpeg", "image/png", "image/gif", "image/webp"]>;
+        width: z.ZodOptional<z.ZodNumber>;
+        height: z.ZodOptional<z.ZodNumber>;
+    }, "strip", z.ZodTypeAny, {
+        type: "image_ref";
+        blobId: string;
+        mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+        width?: number | undefined;
+        height?: number | undefined;
+    }, {
+        type: "image_ref";
+        blobId: string;
+        mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+        width?: number | undefined;
+        height?: number | undefined;
+    }>]>, "many">]>;
     localKey: z.ZodOptional<z.ZodString>;
     meta: z.ZodOptional<z.ZodObject<{
         sentFrom: z.ZodOptional<z.ZodString>;
@@ -550,7 +646,16 @@ declare const UserMessageSchema: z.ZodObject<{
     content: {
         type: "text";
         text: string;
-    };
+    } | ({
+        type: "text";
+        text: string;
+    } | {
+        type: "image_ref";
+        blobId: string;
+        mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+        width?: number | undefined;
+        height?: number | undefined;
+    })[];
     role: "user";
     localKey?: string | undefined;
     meta?: {
@@ -567,7 +672,16 @@ declare const UserMessageSchema: z.ZodObject<{
     content: {
         type: "text";
         text: string;
-    };
+    } | ({
+        type: "text";
+        text: string;
+    } | {
+        type: "image_ref";
+        blobId: string;
+        mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+        width?: number | undefined;
+        height?: number | undefined;
+    })[];
     role: "user";
     localKey?: string | undefined;
     meta?: {

package/dist/lib.d.mts

@@ -291,6 +291,16 @@ type RawJSONLines = z.infer<typeof RawJSONLinesSchema>;
 /**
  * Common RPC types and interfaces for both session and machine clients
  */
+/**
+ * Session context for RPC handlers
+ * Contains environment and path information for the current session
+ */
+interface RpcSessionContext {
+    /** Working directory path for the session */
+    path: string;
+    /** Environment variables (includes direnv if available) */
+    env: Record<string, string>;
+}
 /**
  * Generic RPC handler function type
  * @template TRequest - The request data type
@@ -326,7 +336,19 @@ declare class RpcHandlerManager {
     private readonly encryptionVariant;
     private readonly logger;
     private socket;
+    private sessionContext;
     constructor(config: RpcHandlerConfig);
+    /**
+     * Set the session context (path and environment)
+     * This should be called after direnv environment is loaded
+     * @param context - The session context with path and environment
+     */
+    setSessionContext(context: RpcSessionContext): void;
+    /**
+     * Get the current session context
+     * @returns The session context or null if not set
+     */
+    getSessionContext(): RpcSessionContext | null;
     /**
      * Register an RPC handler for a specific method
      * @param method - The method name (without prefix)
@@ -423,6 +445,30 @@ declare class ApiSessionClient extends EventEmitter {
      */
     flush(): Promise<void>;
     close(): Promise<void>;
+    /**
+     * Download and decrypt a blob from the server
+     * @param blobId - The blob ID to download
+     * @returns The decrypted binary data and metadata, or null if download/decryption fails
+     */
+    downloadBlob(blobId: string): Promise<{
+        data: Uint8Array;
+        mimeType: string;
+        size: number;
+    } | null>;
+    /**
+     * Convert an image_ref content block to a Claude API image content block
+     * Downloads, decrypts, and base64 encodes the image
+     * @param imageRef - The image reference content block
+     * @returns Claude API image content block, or null if conversion fails
+     */
+    resolveImageRef(imageRef: ImageRefContent): Promise<{
+        type: 'image';
+        source: {
+            type: 'base64';
+            media_type: string;
+            data: string;
+        };
+    } | null>;
 }
 
 type PermissionMode = 'default' | 'acceptEdits' | 'bypassPermissions' | 'plan';
@@ -505,9 +551,32 @@ type Machine = {
     daemonState: DaemonState | null;
     daemonStateVersion: number;
 };
+/**
+ * Image reference content block for user messages (E2E encrypted images)
+ */
+declare const ImageRefContentSchema: z.ZodObject<{
+    type: z.ZodLiteral<"image_ref">;
+    blobId: z.ZodString;
+    mimeType: z.ZodEnum<["image/jpeg", "image/png", "image/gif", "image/webp"]>;
+    width: z.ZodOptional<z.ZodNumber>;
+    height: z.ZodOptional<z.ZodNumber>;
+}, "strip", z.ZodTypeAny, {
+    type: "image_ref";
+    blobId: string;
+    mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+    width?: number | undefined;
+    height?: number | undefined;
+}, {
+    type: "image_ref";
+    blobId: string;
+    mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+    width?: number | undefined;
+    height?: number | undefined;
+}>;
+type ImageRefContent = z.infer<typeof ImageRefContentSchema>;
 declare const UserMessageSchema: z.ZodObject<{
     role: z.ZodLiteral<"user">;
-    content: z.ZodObject<{
+    content: z.ZodUnion<[z.ZodObject<{
         type: z.ZodLiteral<"text">;
         text: z.ZodString;
     }, "strip", z.ZodTypeAny, {
@@ -516,7 +585,34 @@ declare const UserMessageSchema: z.ZodObject<{
     }, {
         type: "text";
         text: string;
-    }>;
+    }>, z.ZodArray<z.ZodUnion<[z.ZodObject<{
+        type: z.ZodLiteral<"text">;
+        text: z.ZodString;
+    }, "strip", z.ZodTypeAny, {
+        type: "text";
+        text: string;
+    }, {
+        type: "text";
+        text: string;
+    }>, z.ZodObject<{
+        type: z.ZodLiteral<"image_ref">;
+        blobId: z.ZodString;
+        mimeType: z.ZodEnum<["image/jpeg", "image/png", "image/gif", "image/webp"]>;
+        width: z.ZodOptional<z.ZodNumber>;
+        height: z.ZodOptional<z.ZodNumber>;
+    }, "strip", z.ZodTypeAny, {
+        type: "image_ref";
+        blobId: string;
+        mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+        width?: number | undefined;
+        height?: number | undefined;
+    }, {
+        type: "image_ref";
+        blobId: string;
+        mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+        width?: number | undefined;
+        height?: number | undefined;
+    }>]>, "many">]>;
     localKey: z.ZodOptional<z.ZodString>;
     meta: z.ZodOptional<z.ZodObject<{
         sentFrom: z.ZodOptional<z.ZodString>;
@@ -550,7 +646,16 @@ declare const UserMessageSchema: z.ZodObject<{
     content: {
         type: "text";
         text: string;
-    };
+    } | ({
+        type: "text";
+        text: string;
+    } | {
+        type: "image_ref";
+        blobId: string;
+        mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+        width?: number | undefined;
+        height?: number | undefined;
+    })[];
     role: "user";
     localKey?: string | undefined;
     meta?: {
@@ -567,7 +672,16 @@ declare const UserMessageSchema: z.ZodObject<{
     content: {
         type: "text";
         text: string;
-    };
+    } | ({
+        type: "text";
+        text: string;
+    } | {
+        type: "image_ref";
+        blobId: string;
+        mimeType: "image/jpeg" | "image/png" | "image/gif" | "image/webp";
+        width?: number | undefined;
+        height?: number | undefined;
+    })[];
     role: "user";
     localKey?: string | undefined;
     meta?: {

package/dist/lib.mjs

@@ -1,4 +1,4 @@
-export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-CGco5Y-r.mjs';
+export { A as ApiClient, a as ApiSessionClient, R as RawJSONLinesSchema, c as configuration, l as logger } from './types-Cw6y7GyQ.mjs';
 import 'axios';
 import 'chalk';
 import 'fs';
@@ -17,5 +17,4 @@ import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'url';
-import 'os';
 import 'expo-server-sdk';

package/dist/{list-hET5tyMc.mjs → list-BvtUKVTq.mjs}

@@ -1,4 +1,4 @@
-import { c as configuration, l as logger, d as decodeBase64, b as decrypt, f as formatTimeAgo, e as libsodiumDecryptFromPublicKey } from './types-CGco5Y-r.mjs';
+import { c as configuration, l as logger, d as decodeBase64, b as decrypt, f as formatTimeAgo, e as libsodiumDecryptFromPublicKey } from './types-Cw6y7GyQ.mjs';
 import axios from 'axios';
 import { existsSync, readdirSync, statSync, readFileSync } from 'fs';
 import { join } from 'path';

package/dist/{list-BW6QBLa1.cjs → list-DOsBjFRJ.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types-BsjUgWOx.cjs');
+var types = require('./types-Q-euvEmG.cjs');
 var axios = require('axios');
 var fs = require('fs');
 var path = require('path');

package/dist/{prompt-Dz7G8yGx.mjs → prompt-BbMNN7fl.mjs}

@@ -1,4 +1,4 @@
-import { c as configuration, b as decrypt, d as decodeBase64, l as logger, g as encodeBase64, h as encrypt } from './types-CGco5Y-r.mjs';
+import { c as configuration, b as decrypt, d as decodeBase64, l as logger, g as encodeBase64, h as encrypt } from './types-Cw6y7GyQ.mjs';
 import axios from 'axios';
 import { io } from 'socket.io-client';
 import 'chalk';
@@ -17,7 +17,6 @@ import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'url';
-import 'os';
 import 'expo-server-sdk';
 
 const DEFAULT_TIMEOUT_MINUTES = 20;

package/dist/{prompt-DXkgjktW.cjs → prompt-Dh_trad0.cjs}

@@ -1,6 +1,6 @@
 'use strict';
 
-var types = require('./types-BsjUgWOx.cjs');
+var types = require('./types-Q-euvEmG.cjs');
 var axios = require('axios');
 var socket_ioClient = require('socket.io-client');
 require('chalk');
@@ -19,7 +19,6 @@ require('fs/promises');
 require('crypto');
 require('path');
 require('url');
-require('os');
 require('expo-server-sdk');
 
 const DEFAULT_TIMEOUT_MINUTES = 20;

package/dist/{runCodex-CLGYMNs2.mjs → runCodex-CYkmZphO.mjs}

@@ -1,13 +1,13 @@
 import { useStdout, useInput, Box, Text, render } from 'ink';
 import React, { useState, useRef, useEffect, useCallback } from 'react';
-import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, i as packageJson } from './types-CGco5Y-r.mjs';
+import { l as logger, A as ApiClient, r as readSettings, p as projectPath, c as configuration, i as packageJson } from './types-Cw6y7GyQ.mjs';
 import { Client } from '@modelcontextprotocol/sdk/client/index.js';
 import { StdioClientTransport } from '@modelcontextprotocol/sdk/client/stdio.js';
 import { z } from 'zod';
 import { ElicitRequestSchema } from '@modelcontextprotocol/sdk/types.js';
 import { execSync } from 'child_process';
 import { randomUUID } from 'node:crypto';
-import { i as initialMachineMetadata, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, r as registerKillSessionHandler, a as MessageBuffer, s as startHappyServer, t as trimIdent, b as stopCaffeinate } from './index-DsHtmQqP.mjs';
+import { i as initialMachineMetadata, n as notifyDaemonSessionStarted, M as MessageQueue2, h as hashObject, r as registerKillSessionHandler, a as MessageBuffer, s as startHappyServer, t as trimIdent, b as stopCaffeinate } from './index-BERBU6rR.mjs';
 import os from 'node:os';
 import { resolve, join } from 'node:path';
 import fs from 'node:fs';
@@ -23,13 +23,13 @@ import 'fs/promises';
 import 'crypto';
 import 'path';
 import 'url';
-import 'os';
 import 'expo-server-sdk';
 import 'node:child_process';
 import 'node:readline';
 import 'node:url';
 import 'ps-list';
 import 'cross-spawn';
+import 'os';
 import 'tmp';
 import 'qrcode-terminal';
 import 'open';
@@ -752,6 +752,21 @@ const CodexDisplay = ({ messageBuffer, logPath, onExit }) => {
   ));
 };
 
+function extractTextFromContent(content) {
+  if (!Array.isArray(content)) {
+    if (content.type === "text") {
+      return content.text;
+    }
+    return "";
+  }
+  const textParts = [];
+  for (const block of content) {
+    if (block.type === "text") {
+      textParts.push(block.text);
+    }
+  }
+  return textParts.join("\n");
+}
 function emitReadyIfIdle({ pending, queueSize, shouldExit, sendReady, notify }) {
   if (shouldExit) {
     return false;
@@ -847,7 +862,8 @@ async function runCodex(opts) {
       permissionMode: messagePermissionMode || "default",
       model: messageModel
     };
-    messageQueue.push(message.content.text, enhancedMode);
+    const textContent = extractTextFromContent(message.content);
+    messageQueue.push(textContent, enhancedMode);
   });
   let thinking = false;
   session.keepAlive(thinking, "remote");

package/dist/{runCodex-CylcX5Ug.cjs → runCodex-DUqqO-m8.cjs}

@@ -2,14 +2,14 @@
 
 var ink = require('ink');
 var React = require('react');
-var types = require('./types-BsjUgWOx.cjs');
+var types = require('./types-Q-euvEmG.cjs');
 var index_js = require('@modelcontextprotocol/sdk/client/index.js');
 var stdio_js = require('@modelcontextprotocol/sdk/client/stdio.js');
 var z = require('zod');
 var types_js = require('@modelcontextprotocol/sdk/types.js');
 var child_process = require('child_process');
 var node_crypto = require('node:crypto');
-var index = require('./index-BOBrKhX5.cjs');
+var index = require('./index-CHEjP0zg.cjs');
 var os = require('node:os');
 var node_path = require('node:path');
 var fs = require('node:fs');
@@ -25,13 +25,13 @@ require('fs/promises');
 require('crypto');
 require('path');
 require('url');
-require('os');
 require('expo-server-sdk');
 require('node:child_process');
 require('node:readline');
 require('node:url');
 require('ps-list');
 require('cross-spawn');
+require('os');
 require('tmp');
 require('qrcode-terminal');
 require('open');
@@ -754,6 +754,21 @@ const CodexDisplay = ({ messageBuffer, logPath, onExit }) => {
   ));
 };
 
+function extractTextFromContent(content) {
+  if (!Array.isArray(content)) {
+    if (content.type === "text") {
+      return content.text;
+    }
+    return "";
+  }
+  const textParts = [];
+  for (const block of content) {
+    if (block.type === "text") {
+      textParts.push(block.text);
+    }
+  }
+  return textParts.join("\n");
+}
 function emitReadyIfIdle({ pending, queueSize, shouldExit, sendReady, notify }) {
   if (shouldExit) {
     return false;
@@ -849,7 +864,8 @@ async function runCodex(opts) {
       permissionMode: messagePermissionMode || "default",
       model: messageModel
     };
-    messageQueue.push(message.content.text, enhancedMode);
+    const textContent = extractTextFromContent(message.content);
+    messageQueue.push(textContent, enhancedMode);
   });
   let thinking = false;
   session.keepAlive(thinking, "remote");