diff --git a/cli/cmd/chat/chat.go b/cli/cmd/chat/chat.go index 45a30f0f..68dc2b39 100644 --- a/cli/cmd/chat/chat.go +++ b/cli/cmd/chat/chat.go @@ -61,7 +61,7 @@ type Options struct { // of this file. type ChatService interface { CreateSession(ctx context.Context, req *sdk.CreateSessionRequest) (*sdk.Session, error) - KnowledgeQAStream(ctx context.Context, sessionID string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error) error + KnowledgeQAStream(ctx context.Context, sessionID string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error, opts ...sdk.ResourceURLOptions) error } // NewCmd builds `weknora chat `. diff --git a/cli/cmd/chat/chat_test.go b/cli/cmd/chat/chat_test.go index b85cb5f1..d28f06a0 100644 --- a/cli/cmd/chat/chat_test.go +++ b/cli/cmd/chat/chat_test.go @@ -42,7 +42,7 @@ func (f *fakeChatService) CreateSession(_ context.Context, req *sdk.CreateSessio return &sdk.Session{ID: "sess_auto", Title: req.Title}, nil } -func (f *fakeChatService) KnowledgeQAStream(ctx context.Context, sessionID string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error) error { +func (f *fakeChatService) KnowledgeQAStream(ctx context.Context, sessionID string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error, opts ...sdk.ResourceURLOptions) error { f.streamCalled = true f.gotSessionID = sessionID f.gotRequest = req diff --git a/cli/cmd/message/list.go b/cli/cmd/message/list.go index d19dc365..38cf5259 100644 --- a/cli/cmd/message/list.go +++ b/cli/cmd/message/list.go @@ -34,7 +34,7 @@ type ListOptions struct { // ListService is the narrow SDK surface this command depends on. type ListService interface { - LoadMessages(ctx context.Context, sessionID string, limit int, beforeTime *time.Time) ([]sdk.Message, error) + LoadMessages(ctx context.Context, sessionID string, limit int, beforeTime *time.Time, opts ...sdk.ResourceURLOptions) ([]sdk.Message, error) } // NewCmdList builds `weknora message list --session `. diff --git a/cli/cmd/message/list_test.go b/cli/cmd/message/list_test.go index 2807026b..38812654 100644 --- a/cli/cmd/message/list_test.go +++ b/cli/cmd/message/list_test.go @@ -27,7 +27,7 @@ type fakeListSvc struct { gotBefore *time.Time } -func (s *fakeListSvc) LoadMessages(_ context.Context, sessionID string, limit int, before *time.Time) ([]sdk.Message, error) { +func (s *fakeListSvc) LoadMessages(_ context.Context, sessionID string, limit int, before *time.Time, opts ...sdk.ResourceURLOptions) ([]sdk.Message, error) { s.gotSessID, s.gotLimit, s.gotBefore = sessionID, limit, before return s.items, s.err } diff --git a/cli/cmd/session/ask.go b/cli/cmd/session/ask.go index 726cbf2e..b2d4493c 100644 --- a/cli/cmd/session/ask.go +++ b/cli/cmd/session/ask.go @@ -46,7 +46,7 @@ type AskOptions struct { // agent / KB-chat invocations. type AskService interface { CreateSession(ctx context.Context, req *sdk.CreateSessionRequest) (*sdk.Session, error) - AgentQAStreamWithRequest(ctx context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback) error + AgentQAStreamWithRequest(ctx context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback, opts ...sdk.ResourceURLOptions) error } // NewCmdAsk builds `weknora session ask --agent ""`. diff --git a/cli/cmd/session/ask_test.go b/cli/cmd/session/ask_test.go index 58ad2258..5b98742b 100644 --- a/cli/cmd/session/ask_test.go +++ b/cli/cmd/session/ask_test.go @@ -33,7 +33,7 @@ func (s *scriptedAskSvc) CreateSession(_ context.Context, req *sdk.CreateSession return s.createResp, s.createErr } -func (s *scriptedAskSvc) AgentQAStreamWithRequest(_ context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback) error { +func (s *scriptedAskSvc) AgentQAStreamWithRequest(_ context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback, opts ...sdk.ResourceURLOptions) error { s.got.sessionID = sessionID s.got.req = req for _, e := range s.events { diff --git a/cli/cmd/session/resume.go b/cli/cmd/session/resume.go index cb5362b0..3357a1f7 100644 --- a/cli/cmd/session/resume.go +++ b/cli/cmd/session/resume.go @@ -51,7 +51,7 @@ type ResumeOptions struct { // *sdk.Client satisfies it; tests substitute a fake. Compile-time check // at the bottom of this file. type ResumeService interface { - ContinueStream(ctx context.Context, sessionID, messageID string, cb func(*sdk.StreamResponse) error) error + ContinueStream(ctx context.Context, sessionID, messageID string, cb func(*sdk.StreamResponse) error, opts ...sdk.ResourceURLOptions) error } // NewCmdResume builds `weknora session resume --message `. diff --git a/cli/cmd/session/resume_test.go b/cli/cmd/session/resume_test.go index 6f5f34ab..351516ad 100644 --- a/cli/cmd/session/resume_test.go +++ b/cli/cmd/session/resume_test.go @@ -27,7 +27,7 @@ type scriptedResumeSvc struct { } } -func (s *scriptedResumeSvc) ContinueStream(_ context.Context, sessionID, messageID string, cb func(*sdk.StreamResponse) error) error { +func (s *scriptedResumeSvc) ContinueStream(_ context.Context, sessionID, messageID string, cb func(*sdk.StreamResponse) error, opts ...sdk.ResourceURLOptions) error { s.got.sessionID = sessionID s.got.messageID = messageID for _, e := range s.events { diff --git a/cli/cmd/session/view.go b/cli/cmd/session/view.go index 0681fc24..0adb800f 100644 --- a/cli/cmd/session/view.go +++ b/cli/cmd/session/view.go @@ -43,7 +43,7 @@ type ViewOptions struct { // dependency surface stays minimal. type ViewService interface { GetSession(ctx context.Context, id string) (*sdk.Session, error) - LoadMessages(ctx context.Context, sessionID string, limit int, beforeTime *time.Time) ([]sdk.Message, error) + LoadMessages(ctx context.Context, sessionID string, limit int, beforeTime *time.Time, opts ...sdk.ResourceURLOptions) ([]sdk.Message, error) } // NewCmdView builds `weknora session view `. Renders session metadata diff --git a/cli/cmd/session/view_test.go b/cli/cmd/session/view_test.go index 4e126848..817e6066 100644 --- a/cli/cmd/session/view_test.go +++ b/cli/cmd/session/view_test.go @@ -35,7 +35,7 @@ func (f *fakeViewService) GetSession(_ context.Context, id string) (*sdk.Session return f.s, f.err } -func (f *fakeViewService) LoadMessages(_ context.Context, sessionID string, limit int, _ *time.Time) ([]sdk.Message, error) { +func (f *fakeViewService) LoadMessages(_ context.Context, sessionID string, limit int, _ *time.Time, opts ...sdk.ResourceURLOptions) ([]sdk.Message, error) { f.loadCall.called = true f.loadCall.sessionID = sessionID f.loadCall.limit = limit diff --git a/cli/internal/mcp/tools.go b/cli/internal/mcp/tools.go index e160c2c7..f08432d9 100644 --- a/cli/internal/mcp/tools.go +++ b/cli/internal/mcp/tools.go @@ -91,13 +91,13 @@ type knowledgeService interface { type chatService interface { CreateSession(ctx context.Context, req *sdk.CreateSessionRequest) (*sdk.Session, error) - KnowledgeQAStream(ctx context.Context, sessionID string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error) error + KnowledgeQAStream(ctx context.Context, sessionID string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error, opts ...sdk.ResourceURLOptions) error } type agentService interface { ListAgents(ctx context.Context) ([]sdk.Agent, error) GetAgent(ctx context.Context, agentID string) (*sdk.Agent, error) - AgentQAStreamWithRequest(ctx context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback) error + AgentQAStreamWithRequest(ctx context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback, opts ...sdk.ResourceURLOptions) error } // chunkListService is the narrow surface chunk_list depends on. Kept @@ -114,7 +114,7 @@ type chunkListService interface { // four domain interfaces - also satisfies it. type sessionAskService interface { CreateSession(ctx context.Context, req *sdk.CreateSessionRequest) (*sdk.Session, error) - AgentQAStreamWithRequest(ctx context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback) error + AgentQAStreamWithRequest(ctx context.Context, sessionID string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback, opts ...sdk.ResourceURLOptions) error } // registerTools wires the curated 10 tools onto server. Adding a tool here diff --git a/cli/internal/mcp/tools_test.go b/cli/internal/mcp/tools_test.go index 53aa2fa2..96eebe25 100644 --- a/cli/internal/mcp/tools_test.go +++ b/cli/internal/mcp/tools_test.go @@ -102,7 +102,7 @@ func (f *fakeSvc) CreateSession(_ context.Context, req *sdk.CreateSessionRequest } return f.createSess, f.createSessErr } -func (f *fakeSvc) KnowledgeQAStream(_ context.Context, sess string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error) error { +func (f *fakeSvc) KnowledgeQAStream(_ context.Context, sess string, req *sdk.KnowledgeQARequest, cb func(*sdk.StreamResponse) error, opts ...sdk.ResourceURLOptions) error { f.calls.kbQASess, f.calls.kbQAReq = sess, req for _, e := range f.kbStreamEvents { if err := cb(e); err != nil { @@ -119,7 +119,7 @@ func (f *fakeSvc) GetAgent(_ context.Context, id string) (*sdk.Agent, error) { f.calls.agentViewID = id return f.agent, f.agentErr } -func (f *fakeSvc) AgentQAStreamWithRequest(_ context.Context, sess string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback) error { +func (f *fakeSvc) AgentQAStreamWithRequest(_ context.Context, sess string, req *sdk.AgentQARequest, cb sdk.AgentEventCallback, opts ...sdk.ResourceURLOptions) error { f.calls.agentSess, f.calls.agentReq = sess, req for _, e := range f.agentEvents { if err := cb(e); err != nil {